Skip to content

Commit 055de0b

Browse files
cwisniewcwisniew
authored
Merge pull request #454 from cwisniew/update-actions
2 parents 220061c + 4ad473f commit 055de0b

File tree

2 files changed

+148
-144
lines changed

2 files changed

+148
-144
lines changed

‎.github/workflows/publish.yml‎

Lines changed: 124 additions & 122 deletions
Original file line numberDiff line numberDiff line change
@@ -15,129 +15,131 @@ jobs:
1515
strategy:
1616
matrix:
1717
os: [windows-latest, ubuntu-latest, macOS-13]
18-
java: [ '21' ]
18+
java: ["21"]
19+
distribution: ["temurin"]
1920
fail-fast: false
2021
steps:
21-
# ____ _ __ __ ___ ____ __
22-
# / __ ) __ __ (_)/ /____/ / ( _ ) / __ \ ____ _ _____ / /__ ____ _ ____ _ ___
22+
# ____ _ __ __ ___ ____ __
23+
# / __ ) __ __ (_)/ /____/ / ( _ ) / __ \ ____ _ _____ / /__ ____ _ ____ _ ___
2324
# / __ |/ / / // // // __ / / __ \/| / /_/ // __ `// ___// //_// __ `// __ `// _ \
2425
# / /_/ // /_/ // // // /_/ / / /_/ < / ____// /_/ // /__ / ,< / /_/ // /_/ // __/
25-
# /_____/ \__,_//_//_/ \__,_/ \____/\/ /_/ \__,_/ \___//_/|_| \__,_/ \__, / \___/
26-
# /____/
27-
- name: Git checkout
28-
uses: actions/checkout@v2
29-
- name: Set up JDK
30-
uses: actions/setup-java@v1
31-
with:
32-
java-version: ${{ matrix.java }}
33-
- name: Cache Gradle
34-
uses: actions/cache@v2
35-
with:
36-
path: |
37-
~/.gradle/caches
38-
~/.gradle/wrapper
39-
key: ${{ runner.os }}-gradle-v2-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
40-
restore-keys: |
41-
${{ runner.os }}-gradle-v2-
42-
- name: Build with Gradle
43-
run: ./gradlew jpackage
44-
# For debugging purposes...
45-
- name: List releases
46-
run: ls releases
47-
# _ __ _ __
48-
# | | / /(_)____ ____/ /____ _ __ _____
49-
# | | /| / // // __ \ / __ // __ \| | /| / // ___/
50-
# | |/ |/ // // / / // /_/ // /_/ /| |/ |/ /(__ )
51-
# |__/|__//_//_/ /_/ \__,_/ \____/ |__/|__//____/
52-
#
53-
- name: Rename windows release
54-
if: matrix.os == 'windows-latest'
55-
run: mv releases/TokenTool-*.exe releases/TokenTool-${{ github.event.release.tag_name }}.exe
56-
- name: Upload Windows EXE Release Asset
57-
id: upload-release-asset-exe
58-
uses: actions/upload-release-asset@v1
59-
if: matrix.os == 'windows-latest'
60-
env:
61-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
62-
with:
63-
upload_url: ${{ github.event.release.upload_url }}
64-
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.exe
65-
asset_name: TokenTool-${{ github.event.release.tag_name }}.exe
66-
asset_content_type: application/octet-stream
67-
- name: Upload Windows MSI Release Asset
68-
id: upload-release-asset-msi
69-
uses: actions/upload-release-asset@v1
70-
if: matrix.os == 'windows-latest'
71-
env:
72-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
73-
with:
74-
upload_url: ${{ github.event.release.upload_url }}
75-
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.msi
76-
asset_name: TokenTool-${{ github.event.release.tag_name }}.msi
77-
asset_content_type: application/octet-stream
78-
# __ _
79-
# / / (_)____ __ __ _ __
80-
# / / / // __ \ / / / /| |/_/
81-
# / /___ / // / / // /_/ /_> <
82-
# /_____//_//_/ /_/ \__,_//_/|_|
83-
#
84-
- name: Rename Linux release
85-
if: matrix.os == 'ubuntu-latest'
86-
run: |
87-
mv releases/tokentool-*-1.x86_64.rpm releases/tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
88-
if [ -e releases/tokentool_*1_amd64.deb ]; then mv releases/tokentool_*1_amd64.deb releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb; fi
89-
- name: Upload Linux RPM Release Asset
90-
id: upload-release-asset-rpm
91-
uses: actions/upload-release-asset@v1
92-
if: matrix.os == 'ubuntu-latest'
93-
env:
94-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
95-
with:
96-
upload_url: ${{ github.event.release.upload_url }}
97-
asset_path: releases/tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
98-
asset_name: tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
99-
asset_content_type: application/octet-stream
100-
- name: Upload Linux DEB Release Asset
101-
id: upload-release-asset-deb
102-
uses: actions/upload-release-asset@v1
103-
if: matrix.os == 'ubuntu-latest'
104-
env:
105-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
106-
with:
107-
upload_url: ${{ github.event.release.upload_url }}
108-
asset_path: releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb
109-
asset_name: tokentool_${{ github.event.release.tag_name }}_amd64.deb
110-
asset_content_type: application/octet-stream
111-
# ____ _____
112-
# ____ ___ ____ _ _____ / __ \/ ___/
113-
# / __ `__ \ / __ `// ___// / / /\__ \
114-
# / / / / / // /_/ // /__ / /_/ /___/ /
115-
# /_/ /_/ /_/ \__,_/ \___/ \____//____/
116-
#
117-
- name: Rename Mac release
118-
if: matrix.os == 'macOS-latest'
119-
run: |
120-
mv releases/TokenTool-*.dmg releases/TokenTool-${{ github.event.release.tag_name }}.dmg
121-
mv releases/TokenTool-*.pkg releases/TokenTool-${{ github.event.release.tag_name }}.pkg
122-
- name: Upload Mac DMG Release Asset
123-
id: upload-release-asset-dmg
124-
uses: actions/upload-release-asset@v1
125-
if: matrix.os == 'macOS-latest'
126-
env:
127-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
128-
with:
129-
upload_url: ${{ github.event.release.upload_url }}
130-
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.dmg
131-
asset_name: TokenTool-${{ github.event.release.tag_name }}.dmg
132-
asset_content_type: application/octet-stream
133-
- name: Upload Mac PKG Release Asset
134-
id: upload-release-asset-pkg
135-
uses: actions/upload-release-asset@v1
136-
if: matrix.os == 'macOS-latest'
137-
env:
138-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
139-
with:
140-
upload_url: ${{ github.event.release.upload_url }}
141-
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.pkg
142-
asset_name: TokenTool-${{ github.event.release.tag_name }}.pkg
143-
asset_content_type: application/octet-stream
26+
# /_____/ \__,_//_//_/ \__,_/ \____/\/ /_/ \__,_/ \___//_/|_| \__,_/ \__, / \___/
27+
# /____/
28+
- name: Git checkout
29+
uses: actions/checkout@v3
30+
- name: Set up JDK
31+
uses: actions/setup-java@v2
32+
with:
33+
java-version: ${{ matrix.java }}
34+
distribution: ${{ matrix.distribution }}
35+
- name: Cache Gradle
36+
uses: actions/cache@v4
37+
with:
38+
path: |
39+
~/.gradle/caches
40+
~/.gradle/wrapper
41+
key: ${{ runner.os }}-gradle-V4-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
42+
restore-keys: |
43+
${{ runner.os }}-gradle-V4
44+
- name: Build with Gradle
45+
run: ./gradlew jpackage
46+
# For debugging purposes...
47+
- name: List releases
48+
run: ls releases
49+
# _ __ _ __
50+
# | | / /(_)____ ____/ /____ _ __ _____
51+
# | | /| / // // __ \ / __ // __ \| | /| / // ___/
52+
# | |/ |/ // // / / // /_/ // /_/ /| |/ |/ /(__ )
53+
# |__/|__//_//_/ /_/ \__,_/ \____/ |__/|__//____/
54+
#
55+
- name: Rename windows release
56+
if: matrix.os == 'windows-latest'
57+
run: mv releases/TokenTool-*.exe releases/TokenTool-${{ github.event.release.tag_name }}.exe
58+
- name: Upload Windows EXE Release Asset
59+
id: upload-release-asset-exe
60+
uses: actions/upload-release-asset@v1
61+
if: matrix.os == 'windows-latest'
62+
env:
63+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
64+
with:
65+
upload_url: ${{ github.event.release.upload_url }}
66+
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.exe
67+
asset_name: TokenTool-${{ github.event.release.tag_name }}.exe
68+
asset_content_type: application/octet-stream
69+
- name: Upload Windows MSI Release Asset
70+
id: upload-release-asset-msi
71+
uses: actions/upload-release-asset@v1
72+
if: matrix.os == 'windows-latest'
73+
env:
74+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
with:
76+
upload_url: ${{ github.event.release.upload_url }}
77+
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.msi
78+
asset_name: TokenTool-${{ github.event.release.tag_name }}.msi
79+
asset_content_type: application/octet-stream
80+
# __ _
81+
# / / (_)____ __ __ _ __
82+
# / / / // __ \ / / / /| |/_/
83+
# / /___ / // / / // /_/ /_> <
84+
# /_____//_//_/ /_/ \__,_//_/|_|
85+
#
86+
- name: Rename Linux release
87+
if: matrix.os == 'ubuntu-latest'
88+
run: |
89+
mv releases/tokentool-*-1.x86_64.rpm releases/tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
90+
if [ -e releases/tokentool_*1_amd64.deb ]; then mv releases/tokentool_*1_amd64.deb releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb; fi
91+
- name: Upload Linux RPM Release Asset
92+
id: upload-release-asset-rpm
93+
uses: actions/upload-release-asset@v1
94+
if: matrix.os == 'ubuntu-latest'
95+
env:
96+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
97+
with:
98+
upload_url: ${{ github.event.release.upload_url }}
99+
asset_path: releases/tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
100+
asset_name: tokentool-${{ github.event.release.tag_name }}_x86_64.rpm
101+
asset_content_type: application/octet-stream
102+
- name: Upload Linux DEB Release Asset
103+
id: upload-release-asset-deb
104+
uses: actions/upload-release-asset@v1
105+
if: matrix.os == 'ubuntu-latest'
106+
env:
107+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
108+
with:
109+
upload_url: ${{ github.event.release.upload_url }}
110+
asset_path: releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb
111+
asset_name: tokentool_${{ github.event.release.tag_name }}_amd64.deb
112+
asset_content_type: application/octet-stream
113+
# ____ _____
114+
# ____ ___ ____ _ _____ / __ \/ ___/
115+
# / __ `__ \ / __ `// ___// / / /\__ \
116+
# / / / / / // /_/ // /__ / /_/ /___/ /
117+
# /_/ /_/ /_/ \__,_/ \___/ \____//____/
118+
#
119+
- name: Rename Mac release
120+
if: matrix.os == 'macOS-latest'
121+
run: |
122+
mv releases/TokenTool-*.dmg releases/TokenTool-${{ github.event.release.tag_name }}.dmg
123+
mv releases/TokenTool-*.pkg releases/TokenTool-${{ github.event.release.tag_name }}.pkg
124+
- name: Upload Mac DMG Release Asset
125+
id: upload-release-asset-dmg
126+
uses: actions/upload-release-asset@v1
127+
if: matrix.os == 'macOS-latest'
128+
env:
129+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
130+
with:
131+
upload_url: ${{ github.event.release.upload_url }}
132+
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.dmg
133+
asset_name: TokenTool-${{ github.event.release.tag_name }}.dmg
134+
asset_content_type: application/octet-stream
135+
- name: Upload Mac PKG Release Asset
136+
id: upload-release-asset-pkg
137+
uses: actions/upload-release-asset@v1
138+
if: matrix.os == 'macOS-latest'
139+
env:
140+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
141+
with:
142+
upload_url: ${{ github.event.release.upload_url }}
143+
asset_path: releases/TokenTool-${{ github.event.release.tag_name }}.pkg
144+
asset_name: TokenTool-${{ github.event.release.tag_name }}.pkg
145+
asset_content_type: application/octet-stream

‎.github/workflows/verify-build.yml‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,42 +4,44 @@
44
name: Build Verification
55

66
on:
7-
push:
8-
branches:
7+
push:
8+
branches:
99
- main
1010
- develop
1111
- feature*
1212
- release*
1313
pull_request:
14-
branches:
14+
branches:
1515
- main
1616
- develop
1717
- feature*
1818
- release*
1919
jobs:
2020
build:
2121
name: ${{ matrix.os }} w/JDK ${{ matrix.java }}
22-
runs-on: ${{ matrix.os }}
22+
runs-on: ${{ matrix.os }}
2323
strategy:
2424
matrix:
2525
os: [windows-latest, ubuntu-latest, macOS-13]
26-
java: [ '21' ]
26+
java: ["21"]
27+
distribution: ["temurin"]
2728
fail-fast: false
2829
steps:
29-
- name: Git checkout
30-
uses: actions/checkout@v2
31-
- name: Set up JDK
32-
uses: actions/setup-java@v1
33-
with:
34-
java-version: ${{ matrix.java }}
35-
- name: Cache Gradle
36-
uses: actions/cache@v4
37-
with:
38-
path: |
39-
~/.gradle/caches
40-
~/.gradle/wrapper
41-
key: ${{ runner.os }}-gradle-v4-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
42-
restore-keys: |
43-
${{ runner.os }}-gradle-v4-
44-
- name: Build with Gradle
45-
run: ./gradlew build
30+
- name: Git checkout
31+
uses: actions/checkout@v3
32+
- name: Set up JDK
33+
uses: actions/setup-java@v3
34+
with:
35+
java-version: ${{ matrix.java }}
36+
distribution: ${{ matrix.distribution }}
37+
- name: Cache Gradle
38+
uses: actions/cache@v4
39+
with:
40+
path: |
41+
~/.gradle/caches
42+
~/.gradle/wrapper
43+
key: ${{ runner.os }}-gradle-v4-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
44+
restore-keys: |
45+
${{ runner.os }}-gradle-v4-
46+
- name: Build with Gradle
47+
run: ./gradlew build

0 commit comments

Comments
 (0)