From 93f5d5f92ba5c63f4c74f6134429006b1ca263ce Mon Sep 17 00:00:00 2001 From: Pierre Chalamet Date: Mon, 29 Dec 2025 23:02:44 +0100 Subject: [PATCH] remove macOS x64 support --- .github/workflows/on-push-tag.yml | 1 - .github/workflows/on-release-published.yml | 36 ---------------------- Makefile | 1 - 3 files changed, 38 deletions(-) diff --git a/.github/workflows/on-push-tag.yml b/.github/workflows/on-push-tag.yml index a4769597..1a020c4b 100644 --- a/.github/workflows/on-push-tag.yml +++ b/.github/workflows/on-push-tag.yml @@ -34,7 +34,6 @@ jobs: - name: Pack run: | - (cd .out/dotnet; zip ../terrabuild-${BUILD_VERSION}-dotnet.zip ./*) (cd .out/windows/x64; zip ../../terrabuild-${BUILD_VERSION}-windows-x64.zip ./*) (cd .out/windows/arm64; zip ../../terrabuild-${BUILD_VERSION}-windows-arm64.zip ./*) (cd .out/linux/x64; zip ../../terrabuild-${BUILD_VERSION}-linux-x64.zip ./*) diff --git a/.github/workflows/on-release-published.yml b/.github/workflows/on-release-published.yml index 78cde797..4b483f68 100644 --- a/.github/workflows/on-release-published.yml +++ b/.github/workflows/on-release-published.yml @@ -37,9 +37,7 @@ jobs: - name: Sign Binaries run: | codesign --force --timestamp --sign "Developer ID Application: Magnus Opera (${{ secrets.MAC_DEV_TEAM_ID }})" .out/darwin/arm64/terrabuild --options=runtime --no-strict --entitlements entitlements.plist - codesign --force --timestamp --sign "Developer ID Application: Magnus Opera (${{ secrets.MAC_DEV_TEAM_ID }})" .out/darwin/x64/terrabuild --options=runtime --no-strict --entitlements entitlements.plist (cd .out/darwin/arm64; zip ../terrabuild-${{ github.ref_name }}-darwin-arm64.zip ./*) - (cd .out/darwin/x64; zip ../terrabuild-${{ github.ref_name }}-darwin-x64.zip ./*) - name: Notarize arm64 uses: GuillaumeFalourd/notary-tools@v1 @@ -52,17 +50,6 @@ jobs: xcode_path: '/Applications/Xcode_16.4.app' staple: false - - name: Notarize x64 - uses: GuillaumeFalourd/notary-tools@v1 - timeout-minutes: 5 - with: - product_path: ".out/darwin/terrabuild-${{github.ref_name}}-darwin-x64.zip" - apple_id: ${{ secrets.MAC_DEV_LOGIN }} - password: ${{ secrets.MAC_DEV_PASSWORD }} - team_id: ${{ secrets.MAC_DEV_TEAM_ID }} - xcode_path: '/Applications/Xcode_16.4.app' - staple: false - - name: Upload signed macOS artifacts uses: softprops/action-gh-release@v2.0.6 with: @@ -71,29 +58,6 @@ jobs: .out/darwin/terrabuild-${{github.ref_name}}-darwin-arm64.zip .out/darwin/terrabuild-${{github.ref_name}}-darwin-x64.zip - - name: Remove unsigned macOS artifact - uses: actions/github-script@v7 - with: - script: | - const tag = context.ref.replace('refs/tags/', ''); - const unsignedName = `terrabuild-${tag}-darwin-unsigned.zip`; - const { data: release } = await github.rest.repos.getReleaseByTag({ - owner: context.repo.owner, - repo: context.repo.repo, - tag, - }); - const asset = release.assets.find(a => a.name === unsignedName); - if (!asset) { - core.info(`Unsigned artifact not found: ${unsignedName}`); - return; - } - await github.rest.repos.deleteReleaseAsset({ - owner: context.repo.owner, - repo: context.repo.repo, - asset_id: asset.id, - }); - core.info(`Deleted unsigned artifact: ${unsignedName}`); - update-homebrew-tap: uses: ./.github/workflows/release-homebrew-tap.yml permissions: diff --git a/Makefile b/Makefile index 92088502..2138b0a8 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,6 @@ publish: dotnet publish -c $(config) -p:Version=$(version) -o $(PWD)/.out/dotnet src/Terrabuild publish-darwin: - dotnet publish -c $(config) -r osx-x64 -p:PublishSingleFile=true --self-contained -p:Version=$(version) -p:IncludeNativeLibrariesForSelfExtract=true -o $(PWD)/.out/darwin/x64 src/Terrabuild dotnet publish -c $(config) -r osx-arm64 -p:PublishSingleFile=true --self-contained -p:Version=$(version) -p:IncludeNativeLibrariesForSelfExtract=true -o $(PWD)/.out/darwin/arm64 src/Terrabuild publish-linux: