Skip to content

Commit f38fe31

Browse files
erikburterikburt
authored
chore(ci): bump deps, fixes (#429)
* chore(ci): bump deps, fixes * fix: bump everything to go1.25.7
1 parent f24176a commit f38fe31

15 files changed

Lines changed: 86 additions & 67 deletions

‎.github/actions/changes/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ outputs:
1616
runs:
1717
using: 'composite'
1818
steps:
19-
- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
19+
- uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
2020
id: changes
2121
with:
2222
list-files: 'csv'

‎.github/actions/check-go-version/action.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,18 @@ inputs:
99
outputs:
1010
go_version:
1111
description: 'The extracted Go version.'
12+
value: ${{ steps.extract-go-version.outputs.go_version }}
1213

1314
runs:
1415
using: 'composite'
1516
steps:
1617
- name: Extract go version
18+
id: extract-go-version
1719
shell: bash
20+
env:
21+
WORKING_DIRECTORY: ${{ inputs.working-directory }}
1822
run: |
1923
set -euo pipefail
20-
go_version=$(grep -E '^golang [0-9]+\.[0-9]+\.[0-9]+' ${{ inputs.working-directory }}/.tool-versions | awk '{print $2}')
24+
go_version=$(grep -E '^golang [0-9]+\.[0-9]+\.[0-9]+' ${WORKING_DIRECTORY}/.tool-versions | awk '{print $2}')
2125
echo "go_version=${go_version}" >> $GITHUB_ENV
22-
echo "::set-output name=go_version::${go_version}"
26+
echo "go_version=${go_version}" | tee -a "${GITHUB_OUTPUT}"

‎.github/workflows/aptos-bindings.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
bindgen:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99
- name: Install Aptos CLI
10-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
10+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
1111
with:
1212
CLI_VERSION: 9.1.0
1313
- name: Run make wrappers

‎.github/workflows/aptos-ccip-integration-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@ jobs:
1616
contents: read
1717
steps:
1818
- name: Check out code
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Extract Go version
2222
uses: ./.github/actions/check-go-version
2323

2424
- name: Set up Go
25-
uses: actions/setup-go@v5
25+
uses: actions/setup-go@v6
2626
with:
2727
go-version: ${{ env.go_version }}
2828

2929
- name: Install Aptos CLI
30-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
30+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
3131
with:
3232
CLI_VERSION: 9.1.0
3333

3434
- name: Run tests
3535
run: |
3636
cd integration-tests
37-
go test ./ccip -timeout 10m -v
37+
go test ./ccip -timeout 10m -v

‎.github/workflows/aptos-ccip-tests.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ jobs:
3535
fi
3636
3737
- name: Install Aptos CLI
38-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
38+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
3939
with:
4040
CLI_VERSION: 9.1.0
4141

4242
- name: Checkout chainlink-aptos
43-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
43+
uses: actions/checkout@v6
4444

4545
- name: Checkout chainlink
46-
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
46+
uses: actions/checkout@v6
4747
with:
4848
repository: smartcontractkit/chainlink
4949
ref: ${{ env.CUSTOM_CORE_REF || env.DEFAULT_CORE_REF }}
@@ -56,7 +56,7 @@ jobs:
5656
echo "GO_VERSION=${go_version}" >> "${GITHUB_OUTPUT}"
5757
5858
- name: Set up Go
59-
uses: actions/setup-go@cdcb36043654635271a94b9a6d1392de5bb323a7 # v5.0.1
59+
uses: actions/setup-go@v6
6060
with:
6161
go-version: ${{ steps.tool_versions.outputs.GO_VERSION }}
6262

‎.github/workflows/aptos-contracts.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Check out code
16-
uses: actions/checkout@v4
16+
uses: actions/checkout@v6
1717

1818
- name: Install Aptos CLI
19-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
19+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
2020
with:
2121
CLI_VERSION: 9.1.0
2222

‎.github/workflows/aptos-movefmt.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
movefmt:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99
- name: Install Aptos CLI
10-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
10+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
1111
with:
1212
CLI_VERSION: 9.1.0
1313
- name: Update movefmt

‎.github/workflows/aptos-relayer.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
test:
1212
name: Integration Tests
1313
runs-on: ubuntu-latest
14-
14+
1515
services:
1616
postgres:
1717
image: postgres:16
@@ -26,24 +26,24 @@ jobs:
2626
--health-retries 5
2727
ports:
2828
- 5432:5432
29-
29+
3030
env:
3131
TEST_DB_URL: postgres://user:pass@localhost:5432/testdb_test
32-
32+
3333
steps:
3434
- name: Check out code
35-
uses: actions/checkout@v4
35+
uses: actions/checkout@v6
3636

3737
- name: Extract Go version
3838
uses: ./.github/actions/check-go-version
3939

4040
- name: Set up Go
41-
uses: actions/setup-go@v5
41+
uses: actions/setup-go@v6
4242
with:
4343
go-version: ${{ env.go_version }}
4444

4545
- name: Install Aptos CLI
46-
uses: aptos-labs/actions/install-aptos-cli@ce57287eb852b9819c1d74fecc3be187677559fd # v0.1
46+
uses: aptos-labs/actions/install-aptos-cli@528ef7ad9427a8c0720ea3eea790a9190d6e377d # 2026-04-09
4747
with:
4848
CLI_VERSION: 9.1.0
4949

@@ -61,10 +61,10 @@ jobs:
6161
runs-on: ubuntu-latest
6262
steps:
6363
- name: Checkout
64-
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
64+
uses: actions/checkout@v6
6565

6666
- name: Set up Go
67-
uses: actions/setup-go@v5
67+
uses: actions/setup-go@v6
6868
with:
6969
cache-dependency-path: go.sum
7070
go-version-file: go.mod

‎.github/workflows/aptos-release.yml‎

Lines changed: 35 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,33 +42,39 @@ jobs:
4242
steps:
4343
- name: Setup GitHub Token
4444
id: setup-github-token
45-
uses: smartcontractkit/.github/actions/setup-github-token@ef78fa97bf3c77de6563db1175422703e9e6674f # setup-github-token@0.2.1
45+
uses: smartcontractkit/.github/actions/setup-github-token@setup-github-token/v1
4646
with:
4747
aws-role-arn: ${{ secrets.AWS_ROLE_ARN_GATI_CHANGESETS }}
4848
aws-lambda-url: ${{ secrets.AWS_LAMBDA_URL_GATI }}
4949
aws-region: ${{ secrets.AWS_REGION }}
5050

5151
- name: Checkout this repository
52-
uses: actions/checkout@v4
52+
uses: actions/checkout@v6
5353
with:
5454
fetch-depth: 0
5555

5656
- name: Compute Docker Tag
5757
id: compute-docker-tag
58+
env:
59+
GITHUB_REF: ${{ github.ref }}
60+
GITHUB_REF_NAME: ${{ github.ref_name }}
61+
GITHUB_EVENT_NAME: ${{ github.event_name }}
62+
GITHUB_EVENT_INPUTS_VERSION: ${{ github.event.inputs.version }}
63+
NEXT_VERSION: ${{ env.NEXT_VERSION }}
5864
run: |
59-
BRANCH_NAME=${{ github.ref_name }}
65+
BRANCH_NAME=${GITHUB_REF_NAME}
6066
SHORT_HASH=$(git rev-parse --short HEAD)
61-
INPUT_VERSION="${{ github.event.inputs.version }}"
67+
INPUT_VERSION="${GITHUB_EVENT_INPUTS_VERSION}"
6268
6369
if [[ -n "$INPUT_VERSION" ]]; then
6470
IMAGE_TAG="${INPUT_VERSION}-aptos"
6571
elif [[ "$BRANCH_NAME" == "main" ]]; then
66-
IMAGE_TAG="${{ env.NEXT_VERSION }}-aptos"
72+
IMAGE_TAG="${NEXT_VERSION}-aptos"
6773
elif [[ "$BRANCH_NAME" == "develop" ]]; then
68-
IMAGE_TAG="${{ env.NEXT_VERSION }}-develop-${SHORT_HASH}-aptos"
74+
IMAGE_TAG="${NEXT_VERSION}-develop-${SHORT_HASH}-aptos"
6975
elif [[ "$BRANCH_NAME" == integration/* ]]; then
7076
INTEGRATION_NAME=${BRANCH_NAME#integration/}
71-
IMAGE_TAG="${{ env.NEXT_VERSION }}-${INTEGRATION_NAME}-${SHORT_HASH}-aptos"
77+
IMAGE_TAG="${NEXT_VERSION}-${INTEGRATION_NAME}-${SHORT_HASH}-aptos"
7278
else
7379
echo "Branch '$BRANCH_NAME' does not match expected patterns"
7480
exit 0
@@ -79,39 +85,42 @@ jobs:
7985
8086
- name: Determine Chainlink CORE_REF
8187
id: determine-chainlink-core-ref
88+
env:
89+
INPUT_CORE_REF: ${{ github.event.inputs.core_ref }}
90+
APTOS_CORE_REF: ${{ env.APTOS_CORE_REF }}
8291
run: |
83-
if [ -n "${{ github.event.inputs.core_ref }}" ]; then
84-
echo "CORE_REF provided as input: ${{ github.event.inputs.core_ref }}"
85-
echo "CORE_REF=${{ github.event.inputs.core_ref }}" >> $GITHUB_ENV
92+
if [ -n "${INPUT_CORE_REF}" ]; then
93+
echo "CORE_REF provided as input: ${INPUT_CORE_REF}"
94+
echo "CORE_REF=${INPUT_CORE_REF}" >> $GITHUB_ENV
8695
else
87-
echo "No core_ref provided as input. Using default: ${{ env.APTOS_CORE_REF }}"
88-
echo "CORE_REF=${{ env.APTOS_CORE_REF }}" >> $GITHUB_ENV
96+
echo "No core_ref provided as input. Using default: ${APTOS_CORE_REF}"
97+
echo "CORE_REF=${APTOS_CORE_REF}" >> $GITHUB_ENV
8998
fi
9099
91100
- name: Configure AWS Credentials
92-
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
101+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
93102
with:
94-
aws-region: ${{ vars.AWS_REGION }}
103+
aws-region: ${{ secrets.AWS_REGION }}
95104
role-to-assume: ${{ secrets.AWS_ROLE_ARN_PROD_PUBLISH_ECR }}
96105
role-duration-seconds: 3600
97106
mask-aws-account-id: true
98107

99108
- name: Login to Amazon ECR
100109
id: login-ecr
101-
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
110+
uses: aws-actions/amazon-ecr-login@f2e9fc6c2b355c1890b65e6f6f0e2ac3e6e22f78 # v2.1.2
102111
with:
103112
mask-password: "true"
104113
registries: "${{ secrets.AWS_ACCOUNT_ID_PROD}},${{ secrets.QA_AWS_ACCOUNT_NUMBER }}"
105114

106115
- name: Set up Docker Buildx
107-
uses: docker/setup-buildx-action@0d103c3126aa41d772a8362f6aa67afac040f80c # v3.1.0
116+
uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
108117

109118
# This is not the most efficient way to check if the image exist or not. I was having trouble using aws CLI due to missing permission. We could improve this in a next iteration.
110119
- name: Check if Aptos image already exists
111120
id: check-ecr-tag
121+
env:
122+
IMAGE_URI: ${{ format('{0}.dkr.ecr.{1}.amazonaws.com/chainlink-internal-integrations-aptos:{2}', secrets.AWS_ACCOUNT_ID_PROD, secrets.AWS_REGION, env.IMAGE_TAG) }}
112123
run: |
113-
IMAGE_URI="${{ secrets.AWS_ACCOUNT_ID_PROD }}.dkr.ecr.${{ vars.AWS_REGION }}.amazonaws.com/chainlink-internal-integrations-aptos:${{ env.IMAGE_TAG }}"
114-
115124
# Try to pull the image
116125
if docker pull $IMAGE_URI; then
117126
echo "Image $IMAGE_URI already exists. Skipping image build and push."
@@ -125,7 +134,7 @@ jobs:
125134
126135
- name: Build and Push
127136
if: steps.check-ecr-tag.outputs.SKIP_IMAGE_BUILD == 'false'
128-
uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
137+
uses: docker/build-push-action@bcafcacb16a39f128d818304e6c9c0c18556b85f # v7.1.0
129138
id: build-image
130139
with:
131140
context: ${{ github.workspace }}
@@ -138,11 +147,14 @@ jobs:
138147
- name: Determine if Prerelease
139148
if: steps.check-ecr-tag.outputs.SKIP_IMAGE_BUILD == 'false'
140149
id: determine-prerelease
150+
env:
151+
INPUT_PRERELEASE: ${{ github.event.inputs.prerelease }}
152+
GITHUB_REF_NAME: ${{ github.ref_name }}
141153
run: |
142-
if [[ -n "${{ github.event.inputs.prerelease }}" ]]; then
143-
PRERELEASE=${{ github.event.inputs.prerelease }}
154+
if [[ -n "${INPUT_PRERELEASE}" ]]; then
155+
PRERELEASE=${INPUT_PRERELEASE}
144156
echo "Using provided prerelease value: $PRERELEASE"
145-
elif [[ "${{ github.ref_name }}" == "main" ]]; then
157+
elif [[ "${GITHUB_REF_NAME}" == "main" ]]; then
146158
PRERELEASE=false
147159
echo "Branch 'main' detected. Setting prerelease=false"
148160
else
@@ -154,7 +166,7 @@ jobs:
154166
155167
- name: Create a Release
156168
if: steps.check-ecr-tag.outputs.SKIP_IMAGE_BUILD == 'false'
157-
uses: elgohr/Github-Release-Action@c5ea99036abb741a89f8bf1f2cd7fba845e3313a # v5 https://github.com/elgohr/Github-Release-Action/releases/tag/v5
169+
uses: elgohr/Github-Release-Action@3af318c9bb451e43ab8cea7fa17a5598abe94ed2 # 20240816194204
158170
env:
159171
GH_ENTERPRISE_TOKEN: ${{ steps.setup-github-token.outputs.access-token }}
160172
with:

‎.github/workflows/aptos-run-smoke-tests.yml‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
runs-on: ubuntu-latest
2525
steps:
2626
- name: Checkout code
27-
uses: actions/checkout@v4
27+
uses: actions/checkout@v6
2828

2929
- name: Get core ref from PR body
3030
if: github.event_name == 'pull_request'
@@ -38,7 +38,7 @@ jobs:
3838
fi
3939
4040
- name: Checkout chainlink repo
41-
uses: actions/checkout@v4
41+
uses: actions/checkout@v6
4242
with:
4343
repository: smartcontractkit/chainlink
4444
ref: ${{ env.CUSTOM_CORE_REF || env.DEFAULT_CORE_REF }}
@@ -71,7 +71,7 @@ jobs:
7171
id: go-version
7272

7373
- name: Set up Go
74-
uses: actions/setup-go@v5
74+
uses: actions/setup-go@v6
7575
with:
7676
go-version: ${{ env.go_version }}
7777

@@ -115,11 +115,11 @@ jobs:
115115
set -e
116116
cd integration-tests
117117
go mod tidy
118-
TEST_LOG_LEVEL=${{env.TEST_LOG_LEVEL}} go test -timeout 24h -count=1 -run TestOCR3Keystone ./smoke
118+
TEST_LOG_LEVEL=${TEST_LOG_LEVEL} go test -timeout 24h -count=1 -run TestOCR3Keystone ./smoke
119119
120120
- name: Configure AWS Credentials
121121
if: success() && github.event.pull_request.user.login != 'dependabot[bot]'
122-
uses: aws-actions/configure-aws-credentials@010d0da01d0b5a38af31e9c3470dbfdabdecca3a # v4.0.1
122+
uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6.1.0
123123
with:
124124
aws-region: ${{ secrets.QA_AWS_REGION }}
125125
role-to-assume: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
@@ -129,19 +129,22 @@ jobs:
129129
- name: Login to Amazon ECR
130130
if: success() && github.event.pull_request.user.login != 'dependabot[bot]'
131131
id: login-ecr
132-
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
132+
uses: aws-actions/amazon-ecr-login@f2e9fc6c2b355c1890b65e6f6f0e2ac3e6e22f78 # v2.1.2
133133
with:
134134
mask-password: "true"
135135

136136
- name: Push Image to ECR
137137
if: success() && github.event.pull_request.user.login != 'dependabot[bot]'
138+
env:
139+
CL_ECR: ${{ env.CL_ECR }}
140+
GITHUB_SHA: ${{ github.sha }}
138141
run: |
139-
docker tag chainlink-aptos ${{ env.CL_ECR }}:aptos.${{ github.sha }}
140-
docker push ${{ env.CL_ECR }}:aptos.${{ github.sha }}
142+
docker tag chainlink-aptos ${CL_ECR}:aptos.${GITHUB_SHA}
143+
docker push ${CL_ECR}:aptos.${GITHUB_SHA}
141144
142145
- name: Upload Test Artifacts
143146
if: always()
144-
uses: actions/upload-artifact@v4
147+
uses: actions/upload-artifact@v7
145148
with:
146149
name: smoke-test-logs
147150
path: ./integration-tests/logs/

0 commit comments

Comments
 (0)