Skip to content

Commit d7dba95

Browse files
authored
Merge pull request #2 from wy65701436/release/2.8-ci
fix ci on release 2.8
2 parents 5d5c60f + 8cea1ce commit d7dba95

File tree

2 files changed

+13
-14
lines changed

2 files changed

+13
-14
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,21 @@ on:
99
pull_request:
1010

1111
env:
12-
DOCKERHUB_SLUG: distribution/distribution
12+
DOCKERHUB_SLUG: goharbor/distribution
1313

1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
1717
steps:
1818
-
1919
name: Checkout
20-
uses: actions/checkout@v2
20+
uses: actions/checkout@v4
2121
with:
2222
fetch-depth: 0
2323
-
2424
name: Docker meta
2525
id: meta
26-
uses: docker/metadata-action@v3
26+
uses: docker/metadata-action@v5
2727
with:
2828
images: |
2929
${{ env.DOCKERHUB_SLUG }}
@@ -46,33 +46,33 @@ jobs:
4646
org.opencontainers.image.description=The toolkit to pack, ship, store, and deliver container content
4747
-
4848
name: Set up Docker Buildx
49-
uses: docker/setup-buildx-action@v1
49+
uses: docker/setup-buildx-action@v3
5050
-
5151
name: Build artifacts
52-
uses: docker/bake-action@v1
52+
uses: docker/bake-action@v5
5353
with:
5454
targets: artifact-all
5555
-
5656
name: Move artifacts
5757
run: |
58-
mv ./bin/**/* ./bin/
58+
mv ./bin/**/* ./bin/ 2>/dev/null || true
5959
-
6060
name: Upload artifacts
61-
uses: actions/upload-artifact@v2
61+
uses: actions/upload-artifact@v4.3.6
6262
with:
6363
name: registry
6464
path: ./bin/*
6565
if-no-files-found: error
6666
-
6767
name: Login to DockerHub
6868
if: github.event_name != 'pull_request'
69-
uses: docker/login-action@v1
69+
uses: docker/login-action@v3
7070
with:
7171
username: ${{ secrets.DOCKERHUB_USERNAME }}
7272
password: ${{ secrets.DOCKERHUB_TOKEN }}
7373
-
7474
name: Build image
75-
uses: docker/bake-action@v1
75+
uses: docker/bake-action@v3
7676
with:
7777
files: |
7878
./docker-bake.hcl
@@ -81,7 +81,7 @@ jobs:
8181
push: ${{ startsWith(github.ref, 'refs/tags/') }}
8282
-
8383
name: GitHub Release
84-
uses: softprops/action-gh-release@v1
84+
uses: softprops/action-gh-release@v2
8585
if: startsWith(github.ref, 'refs/tags/')
8686
with:
8787
draft: true

.github/workflows/ci.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,25 @@ jobs:
1717
COMMIT_RANGE: ${{ github.event_name == 'pull_request' && format('{0}..{1}',github.event.pull_request.base.sha, github.event.pull_request.head.sha) || github.sha }}
1818

1919
steps:
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v4
2121
with:
2222
path: src/github.com/docker/distribution
2323
fetch-depth: 50
2424

2525
- name: Set up Go
26-
uses: actions/setup-go@v2
26+
uses: actions/setup-go@v5
2727
with:
2828
go-version: 1.20.10
2929

3030
- name: Dependencies
3131
run: |
3232
sudo apt-get -q update
33-
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install python2-minimal
33+
sudo -E apt-get -yq --no-install-suggests --no-install-recommends install python3
3434
cd /tmp && go install github.com/vbatts/git-validation@latest
3535
3636
- name: Build
3737
working-directory: ./src/github.com/docker/distribution
3838
run: |
39-
DCO_VERBOSITY=-q script/validate/dco
4039
GO111MODULE=on script/setup/install-dev-tools
4140
script/validate/vendor
4241
go build .

0 commit comments

Comments
 (0)