Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into gcs
Browse files Browse the repository at this point in the history
  • Loading branch information
perlman committed Apr 25, 2024
2 parents 3355183 + fca5108 commit 899459d
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 153 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,17 @@ jobs:
build:
strategy:
matrix:
java: [8, 11, 17]
java: [8, 11, 17, 21]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
gradle_commands: --stacktrace build
ArtifactoryUserName: ${{ secrets.JENKINS_USERNAME }}
ArtifactoryPassword: ${{ secrets.JENKINS_PASSWORD }}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
Expand All @@ -31,8 +33,12 @@ jobs:
run: |
./gradlew ${{ env.gradle_commands }}
- name: Upload artifacts
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: bioformats2raw ${{ matrix.java }}
path: build/distributions/*.zip
retention-days: 30
- name: Publish artifacts
if: github.event_name != 'pull_request' && matrix.java == 11
run: |
./gradlew -PArtifactoryUserName=${ArtifactoryUserName} -PArtifactoryPassword=${ArtifactoryPassword} publish
26 changes: 0 additions & 26 deletions appveyor.yml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ configurations.all {

dependencies {
implementation 'net.java.dev.jna:jna:5.10.0'
implementation 'ome:formats-gpl:7.1.0'
implementation 'ome:formats-gpl:7.3.0'
implementation 'info.picocli:picocli:4.7.5'
implementation 'com.univocity:univocity-parsers:2.8.4'
implementation 'dev.zarr:jzarr:0.4.2'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 899459d

Please sign in to comment.