Skip to content

Commit 35c36a3

Browse files
joshuanianjijoshuanianji
authored
Merge pull request #70 from joshuanianji/small-fixes
Small fixes
2 parents 1602a22 + 8d21b7b commit 35c36a3

File tree

6 files changed

+32
-31
lines changed

6 files changed

+32
-31
lines changed

‎.github/actions/build-base-img/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ runs:
3535
uses: ./.github/actions/get-idris-sha
3636

3737
- name: Build Base (versioned)
38-
uses: docker/build-push-action@v4.1.1
38+
uses: docker/build-push-action@v5
3939
if: ${{ inputs.idris-version != 'latest' }}
4040
with:
4141
context: .
@@ -53,7 +53,7 @@ runs:
5353
cache-to: type=gha,mode=max,scope=build-base-${{ inputs.idris-version }}
5454

5555
- name: Build Base (latest)
56-
uses: docker/build-push-action@v4.1.1
56+
uses: docker/build-push-action@v5
5757
if: ${{ inputs.idris-version == 'latest' }}
5858
with:
5959
context: .

‎.github/actions/build-devcontainer-img/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ runs:
4343

4444
- name: Build Devcontainer (versioned)
4545
if: ${{ inputs.idris-lsp-version != 'latest' }}
46-
uses: docker/build-push-action@v4.1.1
46+
uses: docker/build-push-action@v5
4747
with:
4848
context: .
4949
file: devcontainer.Dockerfile
@@ -61,7 +61,7 @@ runs:
6161

6262
- name: Build Devcontainer (latest)
6363
if: ${{ inputs.idris-lsp-version == 'latest' }}
64-
uses: docker/build-push-action@v4.1.1
64+
uses: docker/build-push-action@v5
6565
with:
6666
context: .
6767
file: devcontainer-sha.Dockerfile

‎.github/workflows/version-base-build-test.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout Repo
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Set up SSH
23-
uses: MrSquaare/ssh-setup-action@v2
23+
uses: MrSquaare/ssh-setup-action@v3
2424
with:
2525
host: ${{ secrets.SSH_IP }}
2626
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
2727
private-key-name: oracle-arm
2828

2929
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v2
30+
uses: docker/setup-buildx-action@v3
3131
with:
3232
append: |
3333
- endpoint: ssh://${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@v4
5252

5353
- name: Set up Docker Buildx
54-
uses: docker/setup-buildx-action@v2
54+
uses: docker/setup-buildx-action@v3
5555

5656
- name: Build Base Image
5757
uses: ./.github/actions/build-base-img
@@ -87,10 +87,10 @@ jobs:
8787
TAG: idris-base-${{ inputs.idris-version }}:test
8888
steps:
8989
- name: Checkout Repo
90-
uses: actions/checkout@v3
90+
uses: actions/checkout@v4
9191

9292
- name: Set up Docker Buildx
93-
uses: docker/setup-buildx-action@v2
93+
uses: docker/setup-buildx-action@v3
9494

9595
- name: Build Base Image
9696
uses: ./.github/actions/build-base-img
@@ -125,10 +125,10 @@ jobs:
125125
TAG: idris-consumer-${{ matrix.dockerfile }}-${{ inputs.idris-version }}:test
126126
steps:
127127
- name: Checkout Repo
128-
uses: actions/checkout@v3
128+
uses: actions/checkout@v4
129129

130130
- name: Setup Buildx (no ARM)
131-
uses: docker/setup-buildx-action@v2
131+
uses: docker/setup-buildx-action@v3
132132
with:
133133
# since we're using a local registry
134134
driver-opts: network=host
@@ -144,7 +144,7 @@ jobs:
144144
run: docker image ls
145145

146146
- name: Build ${{ matrix.dockerfile}}
147-
uses: docker/build-push-action@v4.1.1
147+
uses: docker/build-push-action@v5
148148
with:
149149
context: .
150150
file: ${{ matrix.dockerfile }}.Dockerfile

‎.github/workflows/version-base-deploy.yml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,31 +17,31 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: Checkout Repo
20-
uses: actions/checkout@v3
20+
uses: actions/checkout@v4
2121

2222
- name: Set up SSH
23-
uses: MrSquaare/ssh-setup-action@v2
23+
uses: MrSquaare/ssh-setup-action@v3
2424
with:
2525
host: ${{ secrets.SSH_IP }}
2626
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
2727
private-key-name: oracle-arm
2828

2929
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@v2
30+
uses: docker/setup-buildx-action@v3
3131
with:
3232
append: |
3333
- endpoint: ssh://${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}
3434
3535
- name: Login to GHCR
36-
uses: docker/login-action@v2.2.0
36+
uses: docker/login-action@v3
3737
with:
3838
registry: ghcr.io
3939
username: ${{ github.actor }}
4040
password: ${{ secrets.GITHUB_TOKEN }}
4141

4242
- name: Docker meta
4343
id: create-meta
44-
uses: docker/metadata-action@v4
44+
uses: docker/metadata-action@v5
4545
with:
4646
images: ${{ github.repository }}/base
4747

@@ -60,33 +60,34 @@ jobs:
6060
strategy:
6161
matrix:
6262
dockerfile: [ubuntu, debian]
63+
needs: deploy-base
6364
steps:
6465
- name: Checkout Repo
65-
uses: actions/checkout@v3
66+
uses: actions/checkout@v4
6667

6768
# instead of native builds, we'll just use QEMU for consumers
6869
# consumer builds don't really do much intensive stuff anyway
6970
- name: Set up QEMU
70-
uses: docker/setup-qemu-action@v2
71+
uses: docker/setup-qemu-action@v3
7172

7273
- name: Setup Buildx
73-
uses: docker/setup-buildx-action@v2
74+
uses: docker/setup-buildx-action@v3
7475

7576
- name: Login to GHCR
76-
uses: docker/login-action@v2.2.0
77+
uses: docker/login-action@v3
7778
with:
7879
registry: ghcr.io
7980
username: ${{ github.actor }}
8081
password: ${{ secrets.GITHUB_TOKEN }}
8182

8283
- name: Docker meta
8384
id: create-meta
84-
uses: docker/metadata-action@v4
85+
uses: docker/metadata-action@v5
8586
with:
8687
images: ${{ github.repository }}/${{ matrix.dockerfile }}
8788

8889
- name: Build ${{ matrix.dockerfile}}
89-
uses: docker/build-push-action@v4.1.1
90+
uses: docker/build-push-action@v5
9091
with:
9192
context: .
9293
platforms: linux/amd64,linux/arm64

‎.github/workflows/version-devcontainer-build-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
TAG: idris-devcontainer-${{ inputs.idris-lsp-version }}:test
2929
steps:
3030
- name: Checkout Repo
31-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3232

3333
- name: Setup Buildx (no ARM)
34-
uses: docker/setup-buildx-action@v2
34+
uses: docker/setup-buildx-action@v3
3535
with:
3636
# since we're using a local registry
3737
driver-opts: network=host

‎.github/workflows/version-devcontainer-deploy.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,23 +20,23 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout Repo
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Set up SSH
26-
uses: MrSquaare/ssh-setup-action@v2
26+
uses: MrSquaare/ssh-setup-action@v3
2727
with:
2828
host: ${{ secrets.SSH_IP }}
2929
private-key: ${{ secrets.SSH_PRIVATE_KEY }}
3030
private-key-name: oracle-arm
3131

3232
- name: Set up Docker Buildx
33-
uses: docker/setup-buildx-action@v2
33+
uses: docker/setup-buildx-action@v3
3434
with:
3535
append: |
3636
- endpoint: ssh://${{ secrets.SSH_USER }}@${{ secrets.SSH_IP }}
3737
3838
- name: Login to GHCR
39-
uses: docker/login-action@v2.2.0
39+
uses: docker/login-action@v3
4040
with:
4141
registry: ghcr.io
4242
username: ${{ github.actor }}
@@ -48,7 +48,7 @@ jobs:
4848

4949
- name: Docker meta
5050
id: create-meta
51-
uses: docker/metadata-action@v4
51+
uses: docker/metadata-action@v5
5252
with:
5353
images: ${{ github.repository }}/devcontainer
5454

0 commit comments

Comments
 (0)