Open platform to collect and prioritize feedback
tooling: improvements to github workflow (#932)
Guilherme Oenning7c718f82d7f6
diff --git a/.github/workflows/fider.yml b/.github/workflows/build.ymlsimilarity index 70%rename from .github/workflows/fider.ymlrename to .github/workflows/build.ymlindex 71e65af29..2b03d9187 100644--- a/.github/workflows/fider.yml+++ b/.github/workflows/build.yml@@ -1,4 +1,4 @@-name: fider+name: buildon:push:@@ -72,25 +72,27 @@ jobs:runs-on: ubuntu-latestneeds: [test-server, test-ui]steps:- - name: checkout code- uses: actions/checkout@v1- - run: docker build -t getfider/fider .+ - uses: actions/checkout@v2- - name: extract branch name- run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"- id: getBranch+ - name: extract variables+ run: |+ echo "##[set-output name=sha7;]$(echo ${GITHUB_SHA::7})"+ echo sha7=${GITHUB_SHA::7}+ id: vars- - uses: azure/docker-login@v1- if: steps.getBranch.outputs.branch == 'master'- with:- username: ${{ secrets.DOCKER_USER }}- password: ${{ secrets.DOCKER_PASS }}+ - run: docker build --build-arg buildnumber=${{ steps.vars.outputs.sha7 }} -t getfider/fider .- - name: push docker image- if: steps.getBranch.outputs.branch == 'master'- run: |- export SHORT_SHA=`git rev-parse --short=7 ${GITHUB_SHA}`- docker tag getfider/fider getfider/fider:${SHORT_SHA}- docker push getfider/fider:${SHORT_SHA}- docker tag getfider/fider getfider/fider:master- docker push getfider/fider:master+ - run: mkdir -p ./out++ - run: docker save -o ./out/fider.tar getfider/fider++ - run: echo ${{ github.event.number }} > ./out/pr+ if: ${{ github.event_name == 'pull_request' }}++ - run: echo ${{ steps.vars.outputs.sha7 }} > ./out/sha7+ if: ${{ github.event_name == 'push' }}++ - uses: actions/upload-artifact@v2+ with:+ name: out+ path: out/diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.ymlindex 1c210f549..dd6ad8a09 100644--- a/.github/workflows/publish.yml+++ b/.github/workflows/publish.yml@@ -11,7 +11,11 @@ jobs:runs-on: ubuntu-latestif: ${{ github.event.workflow_run.conclusion == 'success' }}steps:- - name: "Download artifact"+ - name: log event context+ env:+ EVENT: ${{ toJSON(github.event) }}+ run: echo "$EVENT"+ - name: download artifactuses: actions/[email protected]with:script: |@@ -32,8 +36,6 @@ jobs:var fs = require('fs');fs.writeFileSync('${{github.workspace}}/out.zip', Buffer.from(download.data));- run: unzip out.zip- - run: ls -lh-- run: docker load --input fider.tar- name: Login to Docker Hubdiff --git a/Dockerfile b/Dockerfileindex f3a5b9cd7..9dc0114ba 100644--- a/Dockerfile+++ b/Dockerfile@@ -3,11 +3,13 @@#####################FROM golang:1.16.2-buster AS server-builder+ARG buildnumber=local+RUN mkdir /serverWORKDIR /serverCOPY . .-RUN GOOS=linux GOARCH=amd64 make build-server+RUN BUILDNUMBER=${buildnumber} GOOS=linux GOARCH=amd64 make build-server#################### UI Build Stepdiff --git a/Makefile b/Makefileindex 8b2e0312a..e778d1ae1 100644--- a/Makefile+++ b/Makefile@@ -2,8 +2,8 @@#### For more information, refer to https://suva.sh/posts/well-documented-makefiles/-LDFLAGS += -X main.buildtime=$(shell date -u "+%Y-%m-%dT%H:%M:%S")"-LDFLAGS += -X main.buildnumber=${GITHUB_RUN_ID}"+LDFLAGS += -X main.buildtime=$(shell date -u "+%Y-%m-%dT%H:%M:%S")+LDFLAGS += -X main.buildnumber=${BUILDNUMBER}##@ Running