Skip to content

Commit 426d73e

Browse files
authored
Merge pull request #25 from sanshengshui/develop-0.7.3
update Upload build artifact yml
2 parents 70332c6 + e4c05e3 commit 426d73e

File tree

7 files changed

+17
-14
lines changed

7 files changed

+17
-14
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ jobs:
4242
uses: actions/cache@v4
4343
with:
4444
path: ~/.m2
45-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
46-
restore-keys: ${{ runner.os }}-m2
45+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-${{ github.sha }}
4746

4847
- name: 'Set release version'
4948
id: version
@@ -71,7 +70,7 @@ jobs:
7170
- name: 'Upload version files'
7271
uses: actions/upload-artifact@v4
7372
with:
74-
name: artifacts
73+
name: artifacts-jvm
7574
path: |
7675
HEAD
7776
*_VERSION
@@ -81,7 +80,7 @@ jobs:
8180
needs: [ version ]
8281
name: 'Build with Graal on ${{ matrix.os }}'
8382
strategy:
84-
fail-fast: false
83+
fail-fast: true
8584
matrix:
8685
os: [ ubuntu-latest, macOS-latest, windows-latest ]
8786
runs-on: ${{ matrix.os }}
@@ -127,7 +126,6 @@ jobs:
127126
with:
128127
path: ~/.m2
129128
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
130-
restore-keys: ${{ runner.os }}-m2
131129

132130
- name: 'Create distribution'
133131
run: mvn -B --file pom.xml -Pnative -DskipTests -pl iot.technology:toolkit-app package -am
@@ -139,8 +137,9 @@ jobs:
139137
- name: 'Upload build artifact'
140138
uses: actions/upload-artifact@v4
141139
with:
142-
name: artifacts
143-
path: toolkit-app/target/*.zip
140+
name: artifacts-${{ matrix.os }}
141+
path: |
142+
toolkit-app/target/*.zip
144143
145144
# Collect all executables and release
146145
release:
@@ -151,6 +150,10 @@ jobs:
151150
# must read HEAD before checkout
152151
- name: 'Download all build artifacts'
153152
uses: actions/download-artifact@v4
153+
with:
154+
pattern: artifacts-*
155+
path: toolkit-app/target
156+
merge-multiple: true
154157

155158
- name: 'Read HEAD ref'
156159
id: head
@@ -192,7 +195,7 @@ jobs:
192195
uses: actions/cache@v4
193196
with:
194197
path: ~/.m2
195-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
198+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}-${{ github.sha }}
196199
restore-keys: ${{ runner.os }}-m2
197200

198201
- name: 'Release with JReleaser'

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<groupId>iot.technology</groupId>
2424
<artifactId>iot-toolkit</artifactId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
<modules>
2727
<module>toolkit-mqtt</module>
2828
<module>toolkit-coap</module>

toolkit-app/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>iot-toolkit</artifactId>
2424
<groupId>iot.technology</groupId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
</parent>
2727

2828

toolkit-coap/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>iot-toolkit</artifactId>
2424
<groupId>iot.technology</groupId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
</parent>
2727

2828

toolkit-common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>iot-toolkit</artifactId>
2424
<groupId>iot.technology</groupId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
</parent>
2727

2828
<name>IoT Technology ToolKit Common</name>

toolkit-mqtt/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>iot-toolkit</artifactId>
2424
<groupId>iot.technology</groupId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
</parent>
2727

2828
<artifactId>toolkit-mqtt</artifactId>

toolkit-nbiot/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<parent>
2323
<artifactId>iot-toolkit</artifactId>
2424
<groupId>iot.technology</groupId>
25-
<version>0.7.3</version>
25+
<version>0.7.2</version>
2626
</parent>
2727
<modelVersion>4.0.0</modelVersion>
2828

0 commit comments

Comments
 (0)