From 49293753d261330c8fff38f43ca5162f5b26c9df Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 30 Nov 2023 11:18:51 +0000 Subject: [PATCH 1/7] build on 22.04 --- .github/workflows/source_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index c0666eb1d60..b4694d719d0 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -13,7 +13,7 @@ jobs: build_zarr: [false, true] build_snapshot: [false] name: Build OMERO from source - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 env: ICE_HOME: /opt/ice-3.6.5 steps: From 5242bb16bedf73415de9572f7ab432aa56e6d040 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 30 Nov 2023 11:19:24 +0000 Subject: [PATCH 2/7] remove duplicate step. Install by action-ice --- .github/workflows/source_build.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index b4694d719d0..6ec5abb3225 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -21,12 +21,6 @@ jobs: - name: Install Ice and Ice python binding if: matrix.build_snapshot uses: ome/action-ice@v2.1 - - name: Set up JDK 11 - if: matrix.build_snapshot - uses: actions/setup-java@v3 - with: - java-version: 11 - distribution: 'zulu' - name: Set up Gradle 6.8.3 if: matrix.build_snapshot uses: gradle/gradle-build-action@v2 From 18cb6f6be174913bd63b72715175f0e032fd8647 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 30 Nov 2023 11:26:52 +0000 Subject: [PATCH 3/7] use action v4 --- .github/workflows/release.yml | 2 +- .github/workflows/source_build.yml | 2 +- .github/workflows/update.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4cfa958cccc..980428c30ad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: name: Release artifacts runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Set version run: | tag_name="${GITHUB_REF##*/}" diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index 6ec5abb3225..79cb14ec21a 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -17,7 +17,7 @@ jobs: env: ICE_HOME: /opt/ice-3.6.5 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ice and Ice python binding if: matrix.build_snapshot uses: ome/action-ice@v2.1 diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index 8654878d234..b1907412ce7 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -8,7 +8,7 @@ jobs: name: Update dependencies runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: update versions run: | bash update_dependencies.sh From c68e97480a682964466120034cc2431cfd0a22c4 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 30 Nov 2023 11:30:16 +0000 Subject: [PATCH 4/7] build on ubuntu 22.04 --- .github/workflows/release.yml | 2 +- .github/workflows/update.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 980428c30ad..69bf11492c7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: jobs: build: name: Release artifacts - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: Set version diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml index b1907412ce7..7ece64fc76c 100644 --- a/.github/workflows/update.yaml +++ b/.github/workflows/update.yaml @@ -6,7 +6,7 @@ on: jobs: build: name: Update dependencies - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - name: update versions From 40a4bfe6eed8a33f7148d55f0954c89d355b75d8 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Thu, 30 Nov 2023 11:38:07 +0000 Subject: [PATCH 5/7] test updated version of action-ice --- .github/workflows/source_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index 79cb14ec21a..25fc47b7a8f 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -11,7 +11,7 @@ jobs: matrix: build_bf: [false] build_zarr: [false, true] - build_snapshot: [false] + build_snapshot: [true] name: Build OMERO from source runs-on: ubuntu-22.04 env: @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Ice and Ice python binding if: matrix.build_snapshot - uses: ome/action-ice@v2.1 + uses: jburel/action-ice@bump_version - name: Set up Gradle 6.8.3 if: matrix.build_snapshot uses: gradle/gradle-build-action@v2 From d428d8a95169bbfa955fa6dfd4db7689061c18d3 Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Dec 2023 12:04:57 +0000 Subject: [PATCH 6/7] build using action-ice v3 --- .github/workflows/source_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index 25fc47b7a8f..602327512b4 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/checkout@v4 - name: Install Ice and Ice python binding if: matrix.build_snapshot - uses: jburel/action-ice@bump_version + uses: ome/action-ice@v3 - name: Set up Gradle 6.8.3 if: matrix.build_snapshot uses: gradle/gradle-build-action@v2 From 900dca01f150366430a36a2e78af83765d3d011c Mon Sep 17 00:00:00 2001 From: Jean-Marie Burel Date: Fri, 1 Dec 2023 12:29:33 +0000 Subject: [PATCH 7/7] revert snapshot build --- .github/workflows/source_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/source_build.yml b/.github/workflows/source_build.yml index 602327512b4..e25e621f27c 100644 --- a/.github/workflows/source_build.yml +++ b/.github/workflows/source_build.yml @@ -11,7 +11,7 @@ jobs: matrix: build_bf: [false] build_zarr: [false, true] - build_snapshot: [true] + build_snapshot: [false] name: Build OMERO from source runs-on: ubuntu-22.04 env: