Skip to content

Commit 2358b13

Browse files
committed
chore: migrate to justfile
1 parent e811453 commit 2358b13

File tree

3 files changed

+31
-24
lines changed

3 files changed

+31
-24
lines changed

.github/workflows/docker-publish-images.yml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,29 @@ jobs:
2929
working-directory: ./harbor
3030

3131
steps:
32-
- uses: actions/checkout@v3
32+
- uses: extractions/setup-just@v3
33+
- uses: actions/checkout@v4
3334
with:
3435
submodules: true
3536

36-
- uses: docker/setup-qemu-action@v2
37-
- uses: docker/setup-buildx-action@v2
37+
- uses: docker/setup-qemu-action@v3
38+
- uses: docker/setup-buildx-action@v3
3839
with:
3940
driver: docker-container
4041
driver-opts: network=host
41-
- uses: docker/login-action@v2
42+
- uses: docker/login-action@v3
4243
with:
4344
registry: ghcr.io
4445
username: ${{ github.actor }}
4546
password: ${{ secrets.GITHUB_TOKEN }}
4647

47-
- run: cd .. && make patch
48+
- run: cd .. && just patch
4849

4950
- id: prepare
5051
run: echo "tag=$(cat ../version)" >> $GITHUB_ENV
5152

5253
- name: Build base image
53-
uses: docker/build-push-action@v4
54+
uses: docker/build-push-action@v6
5455
with:
5556
context: ./harbor
5657
file: ./harbor/make/photon/${{ matrix.component }}/Dockerfile.base
@@ -89,23 +90,24 @@ jobs:
8990
working-directory: ./harbor
9091

9192
steps:
92-
- uses: actions/checkout@v3
93+
- uses: extractions/setup-just@v3
94+
- uses: actions/checkout@v4
9395
with:
9496
submodules: true
9597

9698
- uses: actions/setup-go@v3
9799
with:
98-
go-version: '^1.20.x'
100+
go-version: '^1.x'
99101

100-
- uses: docker/setup-qemu-action@v2
101-
- uses: docker/setup-buildx-action@v2
102+
- uses: docker/setup-qemu-action@v3
103+
- uses: docker/setup-buildx-action@v3
102104
with:
103105
driver: docker-container
104106
driver-opts: network=host
105107

106-
- run: cd .. && make patch
108+
- run: cd .. && just patch
107109

108-
- uses: docker/login-action@v2
110+
- uses: docker/login-action@v3
109111
with:
110112
registry: ghcr.io
111113
username: ${{ github.actor }}

Makefile

Lines changed: 0 additions & 12 deletions
This file was deleted.

justfile

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
export VERSION := `cat version`
2+
3+
all: dep patch
4+
5+
dep:
6+
git submodule update --init --recursive
7+
git submodule update --force --remote
8+
git submodule foreach -q --recursive 'git reset --hard && git checkout ${VERSION}'
9+
10+
[working-directory('harbor')]
11+
patch:
12+
curl "https://github.com/goharbor/harbor/compare/{{ VERSION }}...morlay:patch-{{ VERSION }}.patch" | git apply -v
13+
14+
[working-directory('harbor')]
15+
reset:
16+
git add .
17+
git reset --hard

0 commit comments

Comments
 (0)