From f416e2ccc406b3a61386789532e3176defce93bf Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Wed, 27 Dec 2023 12:35:30 -0800 Subject: [PATCH 1/4] update versions --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 736dbdb..849032c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -13,7 +13,7 @@ jobs: fetch-depth: 0 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 + uses: golangci/golangci-lint-action@v3 with: version: latest @@ -28,9 +28,9 @@ jobs: fetch-depth: 0 - name: Install Go - uses: actions/setup-go@v3 + uses: actions/setup-go@v4 with: - go-version: "1.20" + go-version: "1.21" - name: Test run: go test ./... From 7974b997eafc1dc858172a24e5e37911d59dc73b Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Wed, 27 Dec 2023 12:35:38 -0800 Subject: [PATCH 2/4] try custom forge action --- .github/workflows/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 849032c..e645b9a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,9 @@ jobs: go-version: "1.21" - name: Test - run: go test ./... + uses: gomicro/forge-action + with: + step: test deploy: name: Deploy From eb575ec06703dcda5fdac674300cac29f536126c Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Wed, 27 Dec 2023 13:07:58 -0800 Subject: [PATCH 3/4] update forge file --- forge.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/forge.yaml b/forge.yaml index 8c9dafc..f87181e 100644 --- a/forge.yaml +++ b/forge.yaml @@ -1,5 +1,8 @@ project: name: train +envs: + DOCKER_PASSWORD: $DOCKER_PASSWORD + DOCKER_USERNAME: $DOCKER_USERNAME steps: build: help: Build the project @@ -14,7 +17,18 @@ steps: -o {{.Project}} . clean: help: Clean up all generated files - cmd: go clean + cmds: + - go clean + - rm -f coverage.txt + coverage: + help: generate coverage + cmd: docker run -v $PWD:/src gomicro/gocover + deploy: + help: deploy the artifacts + cmds: + - echo "Logging into Docker Hub" + - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin + - "VERSION={{.ShortSha}} goreleaser release" fmt: help: Run gofmt cmd: go fmt ./... @@ -34,7 +48,7 @@ steps: GOOS: '{{.Os}}' cmd: > go install -ldflags - "-X 'github.com/gomicro/train/cmd.Version=dev-$(git rev-parse --short HEAD)' + "-X 'github.com/gomicro/train/cmd.Version=dev-{{.ShortSha}}' -X 'github.com/gomicro/train/cmd.clientID=$TRAIN_CLIENT_ID' -X 'github.com/gomicro/train/cmd.clientSecret=$TRAIN_CLIENT_SECRET'" test: From d5e85a45cb59108d40795ab89ed5a89e6849013c Mon Sep 17 00:00:00 2001 From: Daniel Hess Date: Wed, 27 Dec 2023 13:08:51 -0800 Subject: [PATCH 4/4] add version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e645b9a..db2fa4e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,7 @@ jobs: go-version: "1.21" - name: Test - uses: gomicro/forge-action + uses: gomicro/forge-action@main with: step: test