From e828632c53ead23ce58e2555fcb0095826120501 Mon Sep 17 00:00:00 2001 From: "Erik A. Brandstadmoen" Date: Sat, 16 Sep 2023 13:22:37 +0200 Subject: [PATCH 1/4] Fix RIDs for .net 8 --- smink/smink.csproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/smink/smink.csproj b/smink/smink.csproj index 36b711a..2a53287 100644 --- a/smink/smink.csproj +++ b/smink/smink.csproj @@ -13,9 +13,8 @@ None - osx.13-x64 - - win-x64;win-x86;win-arm64;alpine-x64;linux-x64;linux-arm64;osx-x64;osx.13-x64;osx.13-arm64;osx.12-arm64;osx.11.0-arm64 + osx-arm64 + win-x64;win-x86;win-arm64;linux-musl-x64;linux-musl-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 true From bdebf5956334550a58752da4d3e8aa9d6e4fe427 Mon Sep 17 00:00:00 2001 From: "Erik A. Brandstadmoen" Date: Sat, 16 Sep 2023 13:26:34 +0200 Subject: [PATCH 2/4] Fix RIDs in github workflows --- .github/workflows/build-and-publish.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index f9fbc87..0632e9a 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -74,10 +74,6 @@ jobs: runs-on: windows-latest strategy: matrix: - # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", - # "alpine-x64", "linux-x64", "linux-arm", "linux-arm64", - # "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64" - # ] arch: [ "win-x64", "win-arm64" ] steps: @@ -106,11 +102,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", - # "alpine-x64", "linux-x64", "linux-arm", "linux-arm64", - # "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64" - # ] - arch: [ "linux-x64" ] + arch: [ "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ] steps: - uses: actions/checkout@v4 @@ -138,11 +130,7 @@ jobs: runs-on: macos-latest strategy: matrix: - # arch: [ "win-x64", "win-x86", "win-arm", "win-arm64", - # "alpine-x64", "linux-x64", "linux-arm", "linux-arm64", - # "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64" - # ] - arch: [ "osx-x64", "osx.11.0-x64", "osx.11.0-arm64", "osx.12-x64", "osx.12-arm64", "osx.13-x64", "osx.13-arm64" ] + arch: [ "osx-x64", "osx-arm64" ] steps: - uses: actions/checkout@v4 From 98f7d94a84189dbdc3f53a6869d9acfdc19f55b4 Mon Sep 17 00:00:00 2001 From: "Erik A. Brandstadmoen" Date: Sat, 16 Sep 2023 13:30:24 +0200 Subject: [PATCH 3/4] Removed linux-musl-arm64 --- .github/workflows/build-and-publish.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 0632e9a..122eee5 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -102,7 +102,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - arch: [ "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ] + arch: [ "linux-x64", "linux-arm64", "linux-musl-x64" ] steps: - uses: actions/checkout@v4 From 46972f94ac11ca7d7823af289cc1edfce5b69ef6 Mon Sep 17 00:00:00 2001 From: "Erik A. Brandstadmoen" Date: Sat, 16 Sep 2023 13:35:15 +0200 Subject: [PATCH 4/4] WIP --- .github/workflows/build-and-publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-publish.yml b/.github/workflows/build-and-publish.yml index 122eee5..1d122a2 100644 --- a/.github/workflows/build-and-publish.yml +++ b/.github/workflows/build-and-publish.yml @@ -102,7 +102,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - arch: [ "linux-x64", "linux-arm64", "linux-musl-x64" ] + #arch: [ "linux-x64", "linux-arm64", "linux-musl-x64", "linux-musl-arm64" ] + arch: [ "linux-x64", "linux-musl-x64" ] steps: - uses: actions/checkout@v4