actions

2020-04-20 03:35:56 -07:00 · 2020-04-20 03:35:56 -07:00 · f0d814a78c
parent 9fdd6c59ce
commit f0d814a78c
6 changed files with 67 additions and 100 deletions
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@ -120,7 +120,7 @@ jobs:
        env:
          COVERALLS: ${{ secrets.COVERALLS }}

-  build-linux:
+  build:
    needs: test
    runs-on: ubuntu-latest
    steps:
@ -153,7 +153,7 @@ jobs:
        env:
          VERSION: ${{ env.VERSION }}
          COMMIT: $GITHUB_SHA
-        run: make build-linux
+        run: make build-linux build-mac build-win

      - name: Upload Release
        id: upload-release-asset
@ -177,106 +177,14 @@ jobs:
            build/statping-openbsd-amd64.tar.gz
            build/statping-openbsd-arm.tar.gz
            build/statping-openbsd-arm64.tar.gz
-
-  build-mac:
-    needs: test
-    runs-on: macos-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.14.2'
-      - uses: actions/checkout@v2
-
-      - name: Setting ENV's
-        run: |
-          echo "::add-path::$(go env GOPATH)/bin"
-          echo ::set-env name=VERSION::$(cat version.txt)
-        shell: bash
-
-      - name: Download Go mods
-        if: steps.golangcache.outputs.cache-hit != 'true'
-        run: |
-          go mod download
-          go mod verify
-          make test-deps
-
-      - name: Download Compiled Frontend (rice-box.go)
-        uses: actions/download-artifact@v1
-        with:
-          name: static-rice-box
-          path: ./source
-
-      - name: Build Binaries
-        env:
-          VERSION: ${{ env.VERSION }}
-          COMMIT: $GITHUB_SHA
-        run: make build-mac
-
-      - name: Upload Release
-        id: upload-release-asset
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ env.VERSION }}
-        with:
-          tag_name: v${{ env.VERSION }}
-          draft: false
-          prerelease: false
-          files: |
            build/statping-darwin-386.tar.gz
            build/statping-darwin-amd64.tar.gz
-
-  build-windows:
-    needs: test
-    runs-on: windows-latest
-    steps:
-      - uses: actions/setup-go@v2
-        with:
-          go-version: '1.14.2'
-      - uses: actions/checkout@v2
-
-      - name: Setting ENV's
-        run: |
-          echo "::add-path::$(go env GOPATH)/bin"
-          echo ::set-env name=VERSION::$(cat version.txt)
-        shell: bash
-
-      - name: Download Go mods
-        if: steps.golangcache.outputs.cache-hit != 'true'
-        run: |
-          go mod download
-          go mod verify
-          make test-deps
-
-      - name: Download Compiled Frontend (rice-box.go)
-        uses: actions/download-artifact@v1
-        with:
-          name: static-rice-box
-          path: ./source
-
-      - name: Build Binaries
-        env:
-          VERSION: ${{ env.VERSION }}
-          COMMIT: $GITHUB_SHA
-        run: make build-windows
-
-      - name: Upload Release
-        id: upload-release-asset
-        uses: softprops/action-gh-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          VERSION: ${{ env.VERSION }}
-        with:
-          tag_name: v${{ env.VERSION }}
-          draft: false
-          prerelease: false
-          files: |
            build/statping-windows-386.zip
            build/statping-windows-amd64.zip
            build/statping-windows-arm.zip

-  post-release:
-    needs: [build-linux, build-mac, build-windows]
+  docker-release:
+    needs: build
    runs-on: ubuntu-latest
    steps:
      - name: Checkout Statping Repo
@ -304,6 +212,17 @@ jobs:
          dockerfile: Dockerfile
          tags: "latest,v${{ env.VERSION }}"

+  sentry-release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Statping Repo
+        uses: actions/checkout@v2
+
+      - name: Setting ENV's
+        run: echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
      - name: Sentry Backend Release
        uses: tclindner/sentry-releases-action@v1.0.0
        env:
@ -326,12 +245,34 @@ jobs:
          tagName: v${{ env.VERSION }}
          environment: production

+  homebrew-release:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Statping Repo
+        uses: actions/checkout@v2
+
+      - name: Setting ENV's
+        run: echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
      - name: Update Homebrew Package
        env:
          VERSION: ${{ env.VERSION }}
          TRAVIS_API: ${{ secrets.TRAVIS_API }}
        run: make publish-homebrew

+  slack-update:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Statping Repo
+        uses: actions/checkout@v2
+
+      - name: Setting ENV's
+        run: echo ::set-env name=VERSION::$(cat version.txt)
+        shell: bash
+
      - name: Slack Notification
        uses: rtCamp/action-slack-notify@v2.0.0
        env:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,6 @@
+# 0.90.30 (04-19-2020)
+- Attempt to fix Github Actions build process
+
 # 0.90.29 (04-19-2020)
 - Added HTTP Redirects for services
 - Removed use of SASS environment variable, now finds path or sends error
--- a/7
+++ b/7
@ -158,7 +158,7 @@ build-linux:
 	do \
 		for os in $(OS);\
 		do \
-			echo "Building $$VERSION $$os-$$arch"; \
+			echo "Building v$$VERSION $$os-$$arch"; \
 			mkdir -p releases/statping-$$os-$$arch/; \
 			GO111MODULE="on" GOOS=$$os GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-$$os-$$arch/statping ${PWD}/cmd || true; \
 			chmod +x releases/statping-$$os-$$arch/statping || true; \
@ -172,7 +172,7 @@ build-mac:
 	export PWD=`pwd`
 	@for arch in $(ARCHS);\
 	do \
-		echo "Building darwin-$$VERSION darwin-$$arch"; \
+		echo "Building v$$VERSION darwin-$$arch"; \
 		mkdir -p releases/statping-darwin-$$arch/; \
 		GO111MODULE="on" GOOS=darwin GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-darwin-$$arch/statping ${PWD}/cmd || true; \
 		chmod +x releases/statping-darwin-$$arch/statping || true; \
@ -181,10 +181,11 @@ build-mac:
 	find ./releases/ -name "*.tar.gz" -type f -size +1M -exec mv "{}" build/ \;

 build-win:
+	mkdir build || true
 	export PWD=`pwd`
 	@for arch in $(ARCHS);\
 	do \
-		echo "Building windows-$$arch"; \
+		echo "Building v$$VERSION windows-$$arch"; \
 		mkdir -p releases/statping-windows-$$arch/; \
 		GO111MODULE="on" GOOS=windows GOARCH=$$arch go build -a -ldflags "-X main.VERSION=${VERSION} -X main.COMMIT=$(TRAVIS_COMMIT)" -o releases/statping-windows-$$arch/statping.exe ${PWD}/cmd || true; \
 		chmod +x releases/statping-windows-$$arch/statping.exe || true; \
--- a/README.md
+++ b/README.md
@ -15,6 +15,8 @@ An easy to use Status Page for your websites and applications. Statping will aut
 <img align="left" width="320" height="235" src="https://img.cjx.io/statupsiterun.gif">
 <h2>A Future-Proof Status Page</h2>
 Statping strives to remain future-proof and remain intact if a failure is created. Your Statping service should not be running on the same instance you're trying to monitor. If your server crashes your Status Page should still remaining online to notify your users of downtime.
+
+<a href="https://labs.play-with-docker.com/?stack=https://raw.githubusercontent.com/statping/statping/master/pwd-stack.yml"><img src="https://assets.statping.com/docker-pwd.png"></a>
 <br><br><br><br><br>

 <h2>No Requirements</h2>
--- a/pwd-stack.yml
+++ b/pwd-stack.yml
@ -0,0 +1,20 @@
+version: '3.1'
+
+services:
+
+  statping:
+    hostname: statping
+    build: https://github.com/statping/statping.git
+    ports:
+      - 8080:8080
+    environment:
+      PORT: 8080
+      SERVICES: '[{"name": "Local Statping", "type": "http", "domain": "http://localhost:8585", "interval": 30}]'
+      DB_CONN: sqlite
+      API_KEY: exampleapikey
+      API_SECRET: exampleapisecret
+      NAME: Statping on SQLite
+      DOMAIN: http://localhost:8080
+      DESCRIPTION: This is a dev environment on SQLite!
+      ADMIN_USER: admin
+      ADMIN_PASS: admin
--- a/version.txt
+++ b/version.txt
@ -1 +1 @@
-0.90.29
+0.90.30
 @ -1 +1 @@
 .90.29
 .90.30