Skip to content

Commit 2ef2b56

Browse files
erikburterikburt
authored
chore: update ci-test-go (#339)
### Change 1. Remove references to grafana auth credentials 2. Update to ci-test-go 0.3.5 - This uses `setup-golang` under the hood which contained a reference to the now defunct https://github.com/tj-actions/branch-names. 3. Pin to sha for `moonrepo/setup-rust` and `metaplex-foundation/actions/install-solana`
1 parent 57b70d9 commit 2ef2b56

File tree

3 files changed

+11
-82
lines changed

3 files changed

+11
-82
lines changed

‎.github/workflows/pull-request-main.yml

+5-30
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@ jobs:
1919
uses: smartcontractkit/.github/actions/ci-lint-go@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # [email protected]
2020
with:
2121
golangci-lint-version: v1.61.0
22-
# grafana inputs
23-
metrics-job-name: ci-test
24-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
25-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
26-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
2722

2823
ci-lint-e2e:
2924
name: Lint E2E tests
@@ -38,23 +33,13 @@ jobs:
3833
with:
3934
golangci-lint-version: v1.62.0
4035
golangci-lint-args: --build-tags="e2e"
41-
metrics-job-name: ci-lint
42-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
43-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
44-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
4536

4637
ci-lint-misc:
4738
name: Lint GH Actions and scripts
4839
runs-on: ubuntu-latest
4940
steps:
5041
- name: Linting Misc (yaml + sh files)
5142
uses: smartcontractkit/.github/actions/ci-lint-misc@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # [email protected]
52-
with:
53-
# grafana inputs
54-
metrics-job-name: ci-lint-misc
55-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
56-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
57-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
5843

5944
ci-test:
6045
name: Tests
@@ -65,15 +50,10 @@ jobs:
6550
actions: read
6651
steps:
6752
- name: Build and test
68-
uses: smartcontractkit/.github/actions/ci-test-go@3835daadbcefcae06d12dc42a405a856c980d2cc # ci-test-go@0.3.4
53+
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/0.3.5
6954
with:
7055
go-test-cmd: go test -coverprofile=coverage.txt $(go list ./...)
7156
use-go-cache: true
72-
# grafana inputs
73-
metrics-job-name: ci-test
74-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
75-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
76-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
7757

7858
ci-test-e2e:
7959
name: Tests E2E
@@ -84,21 +64,16 @@ jobs:
8464
actions: read
8565
steps:
8666
- name: Install Rust
87-
uses: moonrepo/setup-rust@v1
67+
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
8868
- name: Install Solana
89-
uses: metaplex-foundation/actions/install-solana@v1
69+
uses: metaplex-foundation/actions/install-solana@2389940047edc63a5781911f6a53fbdf784748d8 # v1.0.4
9070
with:
91-
version: 1.18.10
71+
version: 1.18.10
9272
- name: Build and test
93-
uses: smartcontractkit/.github/actions/ci-test-go@3835daadbcefcae06d12dc42a405a856c980d2cc # ci-test-go@0.3.4
73+
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/0.3.5
9474
with:
9575
go-test-cmd: go generate -tags=e2e ./e2e/... && CTF_CONFIGS=../config.toml go test -tags=e2e -v ./e2e/tests/...
9676
use-go-cache: true
97-
# grafana inputs
98-
metrics-job-name: ci-test
99-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
100-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
101-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
10277

10378
ci-sonarqube:
10479
name: Sonarqube Scan

‎.github/workflows/push-main.yml

+5-28
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,6 @@ jobs:
1818
uses: smartcontractkit/.github/actions/ci-lint-go@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # [email protected]
1919
with:
2020
golangci-lint-version: v1.62.0
21-
# grafana inputs
22-
metrics-job-name: ci-lint
23-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
24-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
25-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
2621

2722
ci-lint-e2e:
2823
name: Lint E2E tests
@@ -37,10 +32,6 @@ jobs:
3732
with:
3833
golangci-lint-version: v1.62.0
3934
golangci-lint-args: --build-tags="e2e"
40-
metrics-job-name: ci-lint
41-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
42-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
43-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
4435

4536

4637
ci-lint-misc:
@@ -58,15 +49,10 @@ jobs:
5849
actions: read
5950
steps:
6051
- name: ci-test
61-
uses: smartcontractkit/.github/actions/ci-test-go@3835daadbcefcae06d12dc42a405a856c980d2cc # ci-test-go@0.3.4
52+
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/0.3.5
6253
with:
6354
go-test-cmd: go test -coverprofile=coverage.txt $(go list ./...)
6455
use-go-cache: true
65-
# grafana inputs
66-
metrics-job-name: ci-test
67-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
68-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
69-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
7056

7157
ci-test-e2e:
7258
name: Tests E2E
@@ -77,21 +63,17 @@ jobs:
7763
actions: read
7864
steps:
7965
- name: Install Rust
80-
uses: moonrepo/setup-rust@v1
66+
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
8167
- name: Install Solana
82-
uses: metaplex-foundation/actions/install-solana@v1
68+
uses: metaplex-foundation/actions/install-solana@2389940047edc63a5781911f6a53fbdf784748d8 # v1.0.4
8369
with:
8470
version: 1.18.10
8571
- name: Build and test
86-
uses: smartcontractkit/.github/actions/ci-test-go@3835daadbcefcae06d12dc42a405a856c980d2cc # ci-test-go@0.3.4
72+
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/0.3.5
8773
with:
8874
go-test-cmd: go generate -tags=e2e ./e2e/... && CTF_CONFIGS=../config.toml go test -tags=e2e -v ./e2e/tests/...
8975
use-go-cache: true
90-
# grafana inputs
91-
metrics-job-name: ci-test
92-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
93-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
94-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
76+
9577
cd-release:
9678
runs-on: ubuntu-latest
9779
permissions:
@@ -108,11 +90,6 @@ jobs:
10890
aws-region: ${{ secrets.AWS_REGION }}
10991
aws-role-arn: ${{ secrets.AWS_OIDC_MCMS_CI_CHANGESET_TOKEN_ISSUER_ROLE_ARN }}
11092
aws-lambda-url: ${{ secrets.GATI_LAMBDA_DEPLOYMENT_AUTOMATION_URL }}
111-
# grafana inputs
112-
metrics-job-name: cd-release
113-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
114-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
115-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
11693

11794
ci-sonarqube:
11895
name: Sonarqube Scan

‎.github/workflows/push-tag-release.yml

+1-24
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,6 @@ jobs:
1717
uses: smartcontractkit/.github/actions/ci-lint-go@01d931b0455a754d12e7143cc54a5a3521a8f6f6 # [email protected]
1818
with:
1919
golangci-lint-version: v1.62.0
20-
# grafana inputs
21-
metrics-job-name: ci-lint
22-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
23-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
24-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
2520

2621
ci-lint-e2e:
2722
name: Lint E2E tests
@@ -36,11 +31,6 @@ jobs:
3631
with:
3732
golangci-lint-version: v1.62.0
3833
golangci-lint-args: --build-tags="e2e"
39-
metrics-job-name: ci-lint
40-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
41-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
42-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
43-
4434

4535
ci-test:
4636
runs-on: ubuntu-latest
@@ -50,13 +40,7 @@ jobs:
5040
actions: read
5141
steps:
5242
- name: ci-test
53-
uses: smartcontractkit/.github/actions/ci-test-go@3835daadbcefcae06d12dc42a405a856c980d2cc # [email protected]
54-
with:
55-
# grafana inputs
56-
metrics-job-name: ci-test
57-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
58-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
59-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
43+
uses: smartcontractkit/.github/actions/ci-test-go@ci-test-go/0.3.5
6044

6145
cicd-publish-release:
6246
runs-on: ubuntu-latest
@@ -72,19 +56,12 @@ jobs:
7256
app-name: mcms-lib
7357
publish: "false" # do not publish docker image to ECR
7458
update-git-tag: "true"
75-
7659
# goreleaser inputs
7760
goreleaser-args: "--config .goreleaser.yml"
7861
goreleaser-version: '~> v2'
7962
goreleaser-dist: goreleaser-pro
8063
goreleaser-key: ${{ secrets.GORELEASER_KEY }}
8164

82-
# grafana inputs
83-
metrics-job-name: cicd-publish-release
84-
gc-basic-auth: ${{ secrets.GRAFANA_INTERNAL_BASIC_AUTH }}
85-
gc-host: ${{ secrets.GRAFANA_INTERNAL_HOST }}
86-
gc-org-id: ${{ secrets.GRAFANA_INTERNAL_TENANT_ID }}
87-
8865
notify-slack:
8966
if: ${{ success() }}
9067
needs:

0 commit comments

Comments
 (0)