Skip to content

Commit

Permalink
Migrate to macos-13 runner image (#793)
Browse files Browse the repository at this point in the history
* Migrate to macos-13 runner image

* Update Gradle.

* Add duplicatesStrategy

---------

Co-authored-by: John Blischak <[email protected]>
Co-authored-by: Theodore Tsirpanis <[email protected]>
Co-authored-by: Dušan Baran <[email protected]>
  • Loading branch information
4 people authored Dec 5, 2024
1 parent d2a56f5 commit 7f611b0
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ stages:
CXX: g++
BUILD_PYTHON_API: ON
mac:
imageName: 'macOS-12'
imageName: 'macOS-13'
python.version: '3.7'
CXX: clang++
BUILD_PYTHON_API: ON
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ env:
MACOSX_DEPLOYMENT_TARGET: "11"
jobs:
libtiledbvcf:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4
- name: Setup to build htslib from source
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
# USAGE: run-cli-tests.sh <build-dir> <inputs-dir>
libtiledbvcf/test/run-cli-tests.sh libtiledbvcf/build libtiledbvcf/test/inputs
python:
runs-on: macos-12
runs-on: macos-13
needs: libtiledbvcf
env:
DYLD_LIBRARY_PATH: "${{ github.workspace }}/dist/lib"
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
- name: Confirm linking
run: otool -L /Library/Frameworks/Python.framework/Versions/3.11/lib/python3.11/site-packages/tiledbvcf/libtiledbvcf.cpython-*-darwin.so
java:
runs-on: macos-12
runs-on: macos-13
needs: libtiledbvcf
steps:
- uses: actions/checkout@v4
Expand All @@ -114,7 +114,7 @@ jobs:
- name: Test
run: cd apis/java && ./gradlew test
python-standalone:
runs-on: macos-12
runs-on: macos-13
steps:
- uses: actions/checkout@v4
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-12, ubuntu-latest]
os: [macos-13, ubuntu-latest]
branches:
- {libtiledb: release-2.26, tiledb-py: 0.32.0}
- {libtiledb: dev, tiledb-py: dev}
Expand Down
23 changes: 15 additions & 8 deletions apis/java/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ plugins {
id 'java'
id 'idea'
id 'maven-publish'
id 'com.github.sherter.google-java-format' version '0.8'
id 'com.github.johnrengelman.shadow' version '4.0.3'
id 'com.github.sherter.google-java-format' version '0.9'
id 'com.github.johnrengelman.shadow' version '8.1.1'
}

ext.getVersionName = { ->
Expand All @@ -29,8 +29,10 @@ ext.getVersionName = { ->
group 'io.tiledb'
version getVersionName()

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

sourceSets {
main {
Expand All @@ -51,9 +53,9 @@ repositories {

dependencies {
// https://mvnrepository.com/artifact/commons-io/commons-io
compile group: 'commons-io', name: 'commons-io', version: '2.6'
implementation group: 'commons-io', name: 'commons-io', version: '2.17.0'

testCompile group: 'junit', name: 'junit', version: '4.12'
testImplementation group: 'junit', name: 'junit', version: '4.12'
}

test {
Expand Down Expand Up @@ -106,6 +108,10 @@ shadowJar {
import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormat
import com.github.sherter.googlejavaformatgradleplugin.VerifyGoogleJavaFormat

googleJavaFormat {
toolVersion = '1.7'
}

task format(type: GoogleJavaFormat) {
source = sourceSets*.allJava
include '**/*.java'
Expand Down Expand Up @@ -206,12 +212,13 @@ assemble {
}

task sourceJar(type: Jar) {
classifier "sources"
archiveClassifier.set("sources")
from sourceSets.main.allJava
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
}

task javadocJar(type: Jar, dependsOn: javadoc) {
classifier "javadoc"
archiveClassifier.set("javadoc")
from javadoc.destinationDir
}

Expand Down
2 changes: 1 addition & 1 deletion apis/java/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-6.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 7f611b0

Please sign in to comment.