Skip to content

Commit d9e425e

Browse files
committed
Fix GitHub Actions artifact upload
1 parent e763a23 commit d9e425e

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

.github/dependabot.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ updates:
33
- package-ecosystem: gradle
44
directory: "/"
55
schedule:
6-
interval: daily
7-
- package-ecosystem: github-actions
8-
directory: "/"
9-
schedule:
10-
interval: daily
6+
interval: weekly
7+
#- package-ecosystem: github-actions
8+
# directory: "/"
9+
# schedule:
10+
# interval: daily

.github/workflows/main.yml

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,25 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
os: [ubuntu-latest, windows-latest, macOS-latest, macos-13, windows-11-arm]
12+
os: [ubuntu-latest, windows-latest, macOS-latest, macos-13]
1313
steps:
1414
- uses: actions/checkout@v4
1515
- name: Set up JDK
1616
uses: actions/setup-java@v4
1717
with:
1818
java-version: '21'
1919
distribution: 'zulu'
20+
- uses: gradle/actions/setup-gradle@v4
2021
- name: Install Linux dependencies
2122
run: sudo apt-get install libplist-dev libimobiledevice-dev libirecovery-1.0-dev
2223
if: runner.os == 'Linux'
2324
- name: Gradle build
24-
uses: gradle/actions/setup-gradle@v3
25+
run: ./gradlew build --no-daemon
26+
- uses: actions/upload-artifact@v4
2527
with:
26-
arguments: build --no-daemon --scan
27-
dependency-graph: generate-and-submit
28-
- uses: initdc/upload-artifact@feat/artifact-per-file
29-
with:
30-
artifact-per-file: true
31-
artifact-name-rule: ${{ runner.os }}${ext}
28+
# artifact-per-file: true
29+
# artifact-name-rule: ${{ runner.os }}${ext}
30+
name: ${{ runner.os }}-${{ runner.arch }}
3231
path: build/distributions/*
3332
- name: Upload reports on failure
3433
if: ${{ failure() }}
@@ -54,3 +53,5 @@ jobs:
5453
prerelease: false
5554
draft: true
5655
files: "**"
56+
# TODO: replace with https://github.com/softprops/action-gh-release
57+
# or https://github.com/ncipollo/release-action

build.gradle

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ idea.module.outputDir file('out/production/classes') // fix running via IntelliJ
3535
version = '3.6.0'
3636
description = 'A cross-platform GUI and CLI app for saving SHSH blobs'
3737
String appIdentifier = 'airsquared.blobsaver.app'
38-
String copyright = 'Copyright (c) 2023 airsquared'
38+
String copyright = 'Copyright (c) 2025 airsquared'
3939
var os = DefaultNativePlatform.currentOperatingSystem
4040

4141
startScripts.enabled = distZip.enabled = distTar.enabled = false
@@ -55,7 +55,7 @@ dependencies {
5555
implementation 'org.apache.commons:commons-compress:1.27.1'
5656
implementation 'info.picocli:picocli:4.7.7'
5757

58-
testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2'
58+
testImplementation 'org.junit.jupiter:junit-jupiter:5.13.4'
5959
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
6060
testImplementation 'org.testfx:openjfx-monocle:21.0.2'
6161
}
@@ -188,9 +188,6 @@ if (findProperty('installerType') == 'zip') {
188188
if (findProperty('installerType') == 'portable') {
189189
jpackage.enabled = false
190190
}
191-
if (os.isMacOsX() && findProperty('installerType') == null) {
192-
jpackage.finalizedBy createZip
193-
}
194191
if (os.isLinux() && findProperty('installerType') == null) {
195192
jpackage.finalizedBy createTgz
196193
}

0 commit comments

Comments
 (0)