Skip to content

Commit

Permalink
Merge pull request #40 from sbesson/appveyor2ghworkflows
Browse files Browse the repository at this point in the history
Migrate CI to GitHub workflows
  • Loading branch information
chris-allan authored Jun 6, 2024
2 parents 0038b66 + f28e436 commit ca326a9
Show file tree
Hide file tree
Showing 7 changed files with 249 additions and 160 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Gradle

on:
push:
pull_request:
schedule:
- cron: '0 0 * * 0'

jobs:
build:
strategy:
matrix:
java: [8, 11, 17, 21]
os: [ubuntu-latest]
runs-on: ${{ matrix.os }}
env:
gradle_commands: --stacktrace build
steps:
- uses: actions/checkout@v4
- name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.java }}
distribution: 'zulu'
cache: "gradle"
- name: Run commands
run: |
./gradlew ${{ env.gradle_commands }}
- name: Upload artifacts
uses: actions/upload-artifact@v4
with:
name: ome-omero-roitool ${{ matrix.java }}
path: build/distributions/*.zip
retention-days: 30
12 changes: 0 additions & 12 deletions appveyor.yml

This file was deleted.

21 changes: 15 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,19 @@ version = '0.2.7-SNAPSHOT'

mainClassName = 'com.glencoesoftware.roitool.Main'

sourceCompatibility = 1.8
targetCompatibility = 1.8
java {
sourceCompatibility = 1.8
targetCompatibility = 1.8
}

repositories {
jcenter()
mavenCentral()
maven {
name 'Unidata'
url 'https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases'
}
maven {
url 'http://artifacts.openmicroscopy.org/artifactory/maven/'
url 'https://artifacts.openmicroscopy.org/artifactory/maven/'
}
}

Expand Down Expand Up @@ -58,8 +60,15 @@ dependencies {
jar {
manifest {
attributes(
"Main-Class": mainClassName,
"Implementation-Version": version
"Created-By": "Gradle ${gradle.gradleVersion}",
"Build-Jdk": "${System.properties['java.version']} (${System.properties['java.vendor']} ${System.properties['java.vm.version']})",
"Built-By": System.properties['user.name'],
"Built-On": new java.text.SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSZ").format(new Date()),
"Implementation-Build": "git rev-parse --verify HEAD".execute().getText().trim(),
"Implementation-Title": "OME OMERO ROI tool",
"Implementation-Version": archiveVersion,
"Implementation-Vendor": "Glencoe Software Inc.",
"Main-Class": mainClassName
)
}
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit ca326a9

Please sign in to comment.