Skip to content

Commit 16c7c4b

Browse files
committed
Merge branch 'dcs-base-v1.25' into release/dcs/v1.25
2 parents 20ef35b + 749230e commit 16c7c4b

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

.github/workflows/release-nightly-dcs.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,9 @@ jobs:
5959
# aws s3 sync dist/release s3://${{ secrets.AWS_S3_BUCKET }}/gitea/${{ steps.clean_name.outputs.branch }} --no-progress
6060
nightly-docker-rootful:
6161
runs-on: ubuntu-latest
62-
permissions:
63-
packages: write # to publish to ghcr.io
62+
env:
63+
GOPROXY: "https://proxy.golang.org,direct"
64+
GOSUMDB: "sum.golang.org"
6465
steps:
6566
- uses: actions/checkout@v4
6667
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -70,6 +71,8 @@ jobs:
7071
with:
7172
go-version-file: go.mod
7273
check-latest: true
74+
cache: true
75+
cache-dependency-path: go.sum
7376
- uses: docker/setup-qemu-action@v3
7477
- uses: docker/setup-buildx-action@v3
7578
- name: Get cleaned branch name
@@ -82,12 +85,8 @@ jobs:
8285
with:
8386
username: ${{ secrets.DOCKERHUB_USERNAME }}
8487
password: ${{ secrets.DOCKERHUB_TOKEN }}
85-
- name: Login to GHCR using PAT
86-
uses: docker/login-action@v3
87-
with:
88-
registry: ghcr.io
89-
username: ${{ github.repository_owner }}
90-
password: ${{ secrets.GITHUB_TOKEN }}
88+
- name: Download Go modules
89+
run: go mod download
9190
- name: fetch go modules
9291
run: make vendor
9392
- name: build rootful docker image

.github/workflows/release-tag-version-dcs.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ jobs:
1515
docker-rootful:
1616
if: endsWith(github.ref_name, '+dcs') || endsWith(github.ref_name, '+dcs1') || endsWith(github.ref_name, '+dcs2') || endsWith(github.ref_name, '+dcs3')
1717
runs-on: ubuntu-latest
18-
permissions:
19-
packages: write # to publish to ghcr.io
18+
env:
19+
GOPROXY: "https://proxy.golang.org,direct"
20+
GOSUMDB: "sum.golang.org"
2021
steps:
2122
- uses: actions/checkout@v4
2223
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -42,6 +43,8 @@ jobs:
4243
with:
4344
username: ${{ secrets.DOCKERHUB_USERNAME }}
4445
password: ${{ secrets.DOCKERHUB_TOKEN }}
46+
- name: Download Go modules
47+
run: go mod download
4548
- name: build rootful docker image
4649
uses: docker/build-push-action@v5
4750
with:
@@ -53,8 +56,9 @@ jobs:
5356
docker-rootless:
5457
if: endsWith(github.ref_name, '+dcs')
5558
runs-on: ubuntu-latest
56-
permissions:
57-
packages: write # to publish to ghcr.io
59+
env:
60+
GOPROXY: "https://proxy.golang.org,direct"
61+
GOSUMDB: "sum.golang.org"
5862
steps:
5963
- uses: actions/checkout@v4
6064
# fetch all commits instead of only the last as some branches are long lived and could have many between versions
@@ -83,6 +87,8 @@ jobs:
8387
with:
8488
username: ${{ secrets.DOCKERHUB_USERNAME }}
8589
password: ${{ secrets.DOCKERHUB_TOKEN }}
90+
- name: Download Go modules
91+
run: go mod download
8692
- name: build rootless docker image
8793
uses: docker/build-push-action@v5
8894
with:

0 commit comments

Comments
 (0)