From eaab14638f61b12208a361bcdb14b4e02065585b Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 09:27:59 +0200 Subject: [PATCH 01/16] chore: fan out github build to include windows and macos --- .github/workflows/pull_requests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 00dedd4e6..ac354f35f 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -3,10 +3,11 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ${{ matrix.os }}-latest strategy: matrix: - version: [ 8, 11, 17 ] + version: [8, 11, 17] + os: ["windows", "macos", "ubuntu"] steps: - name: Checkout uses: actions/checkout@v4 From 1c2386d9f79521a68bd3dbb25b944be20fefee2b Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 09:30:37 +0200 Subject: [PATCH 02/16] wip: temporarily disable java 8 since that doesn't work with a mac runner --- .github/workflows/pull_requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index ac354f35f..de5f12ec4 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -6,7 +6,7 @@ jobs: runs-on: ${{ matrix.os }}-latest strategy: matrix: - version: [8, 11, 17] + version: [11, 17] os: ["windows", "macos", "ubuntu"] steps: - name: Checkout From bf7783b7df0febb64c8a9b5309816ae206264e17 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 09:43:55 +0200 Subject: [PATCH 03/16] chore: quick and dirty manual classifier for mac/win/linux --- pom.xml | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 85 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index cfe289afe..de0e01014 100644 --- a/pom.xml +++ b/pom.xml @@ -56,12 +56,6 @@ - - io.getunleash - yggdrasil-engine - 0.1.0-alpha.9 - x86_64-linux - com.google.code.gson gson @@ -477,6 +471,91 @@ + + linux-x86_64 + + + Linux + x86_64 + + + + + io.getunleash + yggdrasil-engine + 0.1.0-alpha.9 + x86_64-linux + + + + + windows-x86_64 + + + Windows + x86_64 + + + + + io.getunleash + yggdrasil-engine + 0.1.0-alpha.9 + windows-x86_64 + + + + + macos-x86_64 + + + Mac OS X + x86_64 + + + + + io.getunleash + yggdrasil-engine + 0.1.0-alpha.9 + x86_64-macos + + + + + macos-aarch64 + + + Mac OS X + aarch64 + + + + + io.getunleash + yggdrasil-engine + 0.1.0-alpha.9 + aarch64-macos + + + + + mac-x86_64 + + + Windows + x86_64 + + + + + io.getunleash + yggdrasil-engine + 0.1.0-alpha.9 + windows-x86_64 + + + From 6d8eda718e40efc1cc5f0795bcdb481b16436ce0 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 09:57:17 +0200 Subject: [PATCH 04/16] wip: disable mac/windows --- .github/workflows/pull_requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index de5f12ec4..f1ded3829 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: version: [11, 17] - os: ["windows", "macos", "ubuntu"] + os: ["ubuntu"] steps: - name: Checkout uses: actions/checkout@v4 From 058d3f26928ee9ac597fd82c2b9b331482568fda Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 10:14:33 +0200 Subject: [PATCH 05/16] wip: lower case linux in classifier --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de0e01014..56ace061d 100644 --- a/pom.xml +++ b/pom.xml @@ -475,7 +475,7 @@ linux-x86_64 - Linux + linux x86_64 From 06d54beaea4594da762582d37143f04eb7ea3254 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 10:17:21 +0200 Subject: [PATCH 06/16] wip: dumb test to see if arch classifier works --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 56ace061d..ad79d779d 100644 --- a/pom.xml +++ b/pom.xml @@ -475,7 +475,7 @@ linux-x86_64 - linux + x86_64 @@ -488,7 +488,7 @@ - + From c0d4ef47c537b2b7e27a423b8b1878da03856bb4 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 10:39:29 +0200 Subject: [PATCH 07/16] chore: patch os+arch classifiers --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ad79d779d..52f461d88 100644 --- a/pom.xml +++ b/pom.xml @@ -475,8 +475,8 @@ linux-x86_64 - - x86_64 + Linux + amd64 From 28f1ee11da56ff613e998190f65e94f240989928 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 10:45:11 +0200 Subject: [PATCH 08/16] chore: enabled windows --- .github/workflows/pull_requests.yml | 2 +- pom.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index f1ded3829..6dc85610f 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: version: [11, 17] - os: ["ubuntu"] + os: ["windows", "ubuntu"] steps: - name: Checkout uses: actions/checkout@v4 diff --git a/pom.xml b/pom.xml index 52f461d88..12d82e6f9 100644 --- a/pom.xml +++ b/pom.xml @@ -488,12 +488,12 @@ - From fa3f51d328f9842f8f3fe7a5ff1bee92bc01d065 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 11:51:02 +0200 Subject: [PATCH 11/16] chore: reenable mac --- .github/workflows/pull_requests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index f1ded3829..2449a8d9c 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -7,7 +7,7 @@ jobs: strategy: matrix: version: [11, 17] - os: ["ubuntu"] + os: ["ubuntu", "windows", "macos"] steps: - name: Checkout uses: actions/checkout@v4 From e0896932102f4162775b4fceb3a4cff4ef9c46be Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 12:03:31 +0200 Subject: [PATCH 12/16] chore: bump yggdrasil --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65f2ea077..e6c3585e7 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ io.getunleash yggdrasil-engine - 0.1.0-alpha.10 + 0.1.0-alpha.11 ${os.detected.classifier} From 7633c7f6ae028cab32798aa4026da4fa2a9471e8 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 14:03:22 +0200 Subject: [PATCH 13/16] chore: bump yggdrasil --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e6c3585e7..5c19f30f4 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ io.getunleash yggdrasil-engine - 0.1.0-alpha.11 + 0.1.0-alpha.12 ${os.detected.classifier} From d822a48b5208d4a142396cc6dc87261fabb281f3 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 14:14:37 +0200 Subject: [PATCH 14/16] chore: rollback client spec --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5c19f30f4..1a6d761b5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 5.10.3 4.12.0 UTF-8 - 5.1.9 + 5.1.8 2.17.2 1.3.14 From 997f1782cd87d848fd48d35158d11c2ac48532d4 Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 14:17:26 +0200 Subject: [PATCH 15/16] chore: rollback client spec some more --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1a6d761b5..7e926ec38 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ 5.10.3 4.12.0 UTF-8 - 5.1.8 + 5.1.7 2.17.2 1.3.14 From 464b4b578a07426dbed49e504adc4d0a0a524bcc Mon Sep 17 00:00:00 2001 From: Simon Hornby Date: Thu, 9 Jan 2025 15:42:56 +0200 Subject: [PATCH 16/16] chore: reenable java 8 for linux --- .github/workflows/pull_requests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pull_requests.yml b/.github/workflows/pull_requests.yml index 2449a8d9c..95b5929e0 100644 --- a/.github/workflows/pull_requests.yml +++ b/.github/workflows/pull_requests.yml @@ -6,8 +6,13 @@ jobs: runs-on: ${{ matrix.os }}-latest strategy: matrix: - version: [11, 17] + version: [8, 11, 17] os: ["ubuntu", "windows", "macos"] + exclude: + - version: 8 + os: macos + - version: 8 + os: windows steps: - name: Checkout uses: actions/checkout@v4