From 7c61054659aaed9b0329ebeeb7cbf0f57e9dce23 Mon Sep 17 00:00:00 2001 From: James Read Date: Mon, 11 Oct 2021 13:03:49 +0100 Subject: [PATCH 1/5] Create jenkins-rc-build --- .github/workflows/jenkins-rc-build | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/jenkins-rc-build diff --git a/.github/workflows/jenkins-rc-build b/.github/workflows/jenkins-rc-build new file mode 100644 index 0000000..ab9541f --- /dev/null +++ b/.github/workflows/jenkins-rc-build @@ -0,0 +1,17 @@ +name: "Jenkins RC Build" + +on: [push] + +jobs: + codestyle: + runs-on: ubuntu-latest + steps: + - name: Trigger jenkins job + uses: jabbukka/jenkins-trigger@main + with: + url: ${{ secrets.JENKINS_URL }} + job_name: "OliveTin/OliveTin-rc-builder" + user_name: ${{ secrets.JENKINS_USER }} + api_token: ${{ secrets.JENKINS_TOKEN }} + wait: "true" + timeout: "1000" From f1fba166062f309f025ec0548db2a2222cbf648e Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 11 Oct 2021 13:07:49 +0100 Subject: [PATCH 2/5] missed file ext --- .github/workflows/{jenkins-rc-build => jenkins-rc-build.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{jenkins-rc-build => jenkins-rc-build.yml} (100%) diff --git a/.github/workflows/jenkins-rc-build b/.github/workflows/jenkins-rc-build.yml similarity index 100% rename from .github/workflows/jenkins-rc-build rename to .github/workflows/jenkins-rc-build.yml From f333e5903694aff4fcf20d1619099eb56a4d384b Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 11 Oct 2021 13:28:49 +0100 Subject: [PATCH 3/5] Added manual workflow option to RC build --- .github/workflows/jenkins-rc-build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/jenkins-rc-build.yml b/.github/workflows/jenkins-rc-build.yml index ab9541f..1a8ee4d 100644 --- a/.github/workflows/jenkins-rc-build.yml +++ b/.github/workflows/jenkins-rc-build.yml @@ -1,6 +1,14 @@ name: "Jenkins RC Build" -on: [push] +on: + push: + branches: [ main ] + workflow_dispatch: + inputs: + reason: + description: "Reason" + required: true + default: "no reason given" jobs: codestyle: From 06ff15b9bff42ef24c70dd6ffe4bf43aa5c73f60 Mon Sep 17 00:00:00 2001 From: jamesread Date: Mon, 11 Oct 2021 13:33:36 +0100 Subject: [PATCH 4/5] Moved to different jenkins-action --- .github/workflows/jenkins-rc-build.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/jenkins-rc-build.yml b/.github/workflows/jenkins-rc-build.yml index 1a8ee4d..1cf2176 100644 --- a/.github/workflows/jenkins-rc-build.yml +++ b/.github/workflows/jenkins-rc-build.yml @@ -11,15 +11,13 @@ on: default: "no reason given" jobs: - codestyle: + jenkins-trigger: runs-on: ubuntu-latest steps: - name: Trigger jenkins job - uses: jabbukka/jenkins-trigger@main + uses: appleboy/jenkins-action@master with: url: ${{ secrets.JENKINS_URL }} - job_name: "OliveTin/OliveTin-rc-builder" - user_name: ${{ secrets.JENKINS_USER }} - api_token: ${{ secrets.JENKINS_TOKEN }} - wait: "true" - timeout: "1000" + user: ${{ secrets.JENKINS_USER }} + token: ${{ secrets.JENKINS_TOKEN }} + job: "OliveTin/OliveTin-rc-builder" From 05b3c39bb0cdc4ea1c292558a7c35508bf4a4417 Mon Sep 17 00:00:00 2001 From: James Read Date: Mon, 11 Oct 2021 19:22:01 +0100 Subject: [PATCH 5/5] Moved deps into their own target --- Makefile | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7860a7e..c804fbb 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,15 @@ daemon-unittests: mkdir -p reports go test ./... -coverprofile reports/unittests.out go tool cover -html=reports/unittests.out -o reports/unittests.html + +go-tools: + go install "github.com/bufbuild/buf/cmd/buf" + go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-grpc-gateway" + go install "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2" + go install "google.golang.org/grpc/cmd/protoc-gen-go-grpc" + go install "google.golang.org/protobuf/cmd/protoc-gen-go" -grpc: +grpc: go-tools buf generate podman-image: