Skip to content

Commit bc3944d

Browse files
authored
Merge pull request #1430 from flaix/update-actions
Update workflows due to deprecations in actions
2 parents 72bcabf + c950ce3 commit bc3944d

File tree

2 files changed

+19
-16
lines changed

2 files changed

+19
-16
lines changed

.github/workflows/ci-build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ jobs:
2020

2121
steps:
2222
- name: Checkout
23-
uses: actions/checkout@v1
23+
uses: actions/checkout@v3
2424
with:
2525
submodules: true
2626

2727
- name: Setup Java ${{ matrix.java-version }}
28-
uses: actions/setup-java@v1
28+
uses: actions/setup-java@v3
2929
with:
3030
java-version: ${{ matrix.java-version }}
31+
distribution: 'temurin'
3132

3233
- name: Setup Moxie
3334
run: |
@@ -53,14 +54,15 @@ jobs:
5354

5455
steps:
5556
- name: Checkout
56-
uses: actions/checkout@v1
57+
uses: actions/checkout@v3
5758
with:
5859
submodules: true
5960

6061
- name: Setup Java ${{ matrix.java-version }}
61-
uses: actions/setup-java@v1
62+
uses: actions/setup-java@v3
6263
with:
6364
java-version: ${{ matrix.java-version }}
65+
distribution: 'temurin'
6466

6567
- name: Report Java version
6668
run: |

.github/workflows/nightly-build.yml

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
steps:
3131

3232
- name: Cache marker for latest commit
33-
uses: actions/cache@v2
33+
uses: actions/cache@v3
3434
id: cache-sha
3535
with:
3636
key: sha-${{ github.sha }}
@@ -68,14 +68,15 @@ jobs:
6868
steps:
6969

7070
- name: Checkout Gitblit
71-
uses: actions/checkout@v1
71+
uses: actions/checkout@v3
7272
with:
7373
submodules: true
7474

7575
- name: Setup Java 8
76-
uses: actions/setup-java@v1
76+
uses: actions/setup-java@v3
7777
with:
7878
java-version: 8
79+
distribution: 'temurin'
7980

8081
- name: Report Java version
8182
run: |
@@ -87,7 +88,7 @@ jobs:
8788

8889
- name: Save built Gitblit package
8990
if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
90-
uses: actions/upload-artifact@v2
91+
uses: actions/upload-artifact@v3
9192
with:
9293
name: gitblit-nightly
9394
path: build/target/gitblit-*-SNAPSHOT.tar.gz
@@ -110,7 +111,7 @@ jobs:
110111
id: check-dh-login
111112
run: |
112113
if [[ -n "${{secrets.DOCKERHUB_GB_TOKEN}}" && -n "${{secrets.DOCKERHUB_GB_USER}}" ]] ; then
113-
echo "::set-output name=secrets_present::true"
114+
echo "secrets_present=true" >> $GITHUB_OUTPUT
114115
else
115116
echo "No Docker Hub login data found. Skipping Docker."
116117
fi
@@ -131,21 +132,21 @@ jobs:
131132

132133
steps:
133134
- name: Checkout gitblit-docker
134-
uses: actions/checkout@v1
135+
uses: actions/checkout@v3
135136
with:
136137
repository: ${{ env.GH_ORG }}/gitblit-docker
137138
ref: master
138139
fetch-depth: 2
139140

140141
- name: Download Gitblit nightly build
141-
uses: actions/download-artifact@v2
142+
uses: actions/download-artifact@v3
142143
id: get-gb
143144
with:
144145
name: gitblit-nightly
145146
path: ../gitblit-docker
146147

147148
# Delete the artifact unless this is the official Gitblit repo
148-
- uses: geekyeggo/delete-artifact@v1
149+
- uses: geekyeggo/delete-artifact@v2
149150
if: ${{ github.repository != 'gitblit/gitblit' }}
150151
with:
151152
name: gitblit-nightly
@@ -162,7 +163,7 @@ jobs:
162163
gbver=${gbver##*gitblit-}
163164
echo "Version detected: $gbver"
164165
echo "GITBLIT_VERSION=$gbver" >> "${GITHUB_ENV}"
165-
echo "::set-output name=gb-version::$gbver"
166+
echo "gb-version=$gbver" >> $GITHUB_OUTPUT
166167
167168
- name: Generate Dockerfile for snapshot image
168169
working-directory: ../gitblit-docker
@@ -171,13 +172,13 @@ jobs:
171172
echo "BUILD_DATE=$(date +%Y-%m-%dT%H:%M:%S)" >> "${GITHUB_ENV}"
172173
173174
- name: Login to Docker Hub
174-
uses: docker/login-action@v1
175+
uses: docker/login-action@v2
175176
with:
176177
username: ${{ secrets.DOCKERHUB_GB_USER }}
177178
password: ${{ secrets.DOCKERHUB_GB_TOKEN }}
178179

179180
- name: Build snapshot docker image
180-
uses: docker/build-push-action@v2
181+
uses: docker/build-push-action@v3
181182
with:
182183
file: ../gitblit-docker/generate/Dockerfile
183184
context: ../gitblit-docker
@@ -226,7 +227,7 @@ jobs:
226227
dgoss run -p 8080:8080 -p 8443:8443 --tmpfs /var/opt/gitblit/temp gitblit/gitblit:nightly
227228
228229
- name: Push docker image to registry
229-
uses: docker/build-push-action@v2
230+
uses: docker/build-push-action@v3
230231
with:
231232
file: ../gitblit-docker/generate/Dockerfile
232233
context: ../gitblit-docker

0 commit comments

Comments
 (0)