Skip to content

Commit 22d84ba

Browse files
committed
build: remove macOS Intel release artifacts
1 parent d06f066 commit 22d84ba

5 files changed

Lines changed: 3 additions & 23 deletions

File tree

.github/scripts/fscript-formula-template.rb

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,6 @@ class Fscript${FSCRIPT_SUFFIX} < Formula
44
homepage "https://github.com/magnusopera/fscript"
55
version "${FSCRIPT_VERSION}"
66

7-
if OS.mac? && Hardware::CPU.intel?
8-
url "${FSCRIPT_DARWIN_X64_URL}"
9-
sha256 "${FSCRIPT_DARWIN_X64_SHA256}"
10-
end
11-
127
if OS.mac? && Hardware::CPU.arm?
138
url "${FSCRIPT_DARWIN_ARM64_URL}"
149
sha256 "${FSCRIPT_DARWIN_ARM64_SHA256}"

.github/scripts/generate-homebrew-tap

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ cd "$(mktemp -d)"
2323
>&2 echo "::info Generating Homebrew formula for FScript ${FSCRIPT_VERSION}"
2424
>&2 echo "::group::Download release assets"
2525
>&2 gh release download --repo "${FSCRIPT_GH_REPO}" "${FSCRIPT_VERSION}" \
26-
-p "fscript-${FSCRIPT_VERSION}-darwin-x64.zip" \
2726
-p "fscript-${FSCRIPT_VERSION}-darwin-arm64.zip" \
2827
-p "fscript-${FSCRIPT_VERSION}-linux-x64.zip" \
2928
-p "fscript-${FSCRIPT_VERSION}-linux-arm64.zip" \
3029
--skip-existing
3130
>&2 echo "::endgroup::"
3231

3332
for i in \
34-
"darwin x64 FSCRIPT_DARWIN_X64" \
3533
"darwin arm64 FSCRIPT_DARWIN_ARM64" \
3634
"linux x64 FSCRIPT_LINUX_X64" \
3735
"linux arm64 FSCRIPT_LINUX_ARM64" \
@@ -56,4 +54,4 @@ for i in \
5654
done
5755

5856
# shellcheck disable=SC2016
59-
envsubst '$FSCRIPT_VERSION,$FSCRIPT_SUFFIX,$FSCRIPT_DARWIN_X64_URL,$FSCRIPT_DARWIN_X64_SHA256,$FSCRIPT_DARWIN_ARM64_URL,$FSCRIPT_DARWIN_ARM64_SHA256,$FSCRIPT_LINUX_X64_URL,$FSCRIPT_LINUX_X64_SHA256,$FSCRIPT_LINUX_ARM64_URL,$FSCRIPT_LINUX_ARM64_SHA256' < "${TAP_TEMPLATE_FILE}"
57+
envsubst '$FSCRIPT_VERSION,$FSCRIPT_SUFFIX,$FSCRIPT_DARWIN_ARM64_URL,$FSCRIPT_DARWIN_ARM64_SHA256,$FSCRIPT_LINUX_X64_URL,$FSCRIPT_LINUX_X64_SHA256,$FSCRIPT_LINUX_ARM64_URL,$FSCRIPT_LINUX_ARM64_SHA256' < "${TAP_TEMPLATE_FILE}"

.github/workflows/on-release-published.yml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -157,9 +157,7 @@ jobs:
157157
- name: Sign binaries
158158
run: |
159159
codesign --force --timestamp --sign "Developer ID Application: Magnus Opera (${{ secrets.MAC_DEV_TEAM_ID }})" .out/darwin/arm64/fscript --options=runtime --no-strict --entitlements .out/darwin/entitlements.plist --identifier "${{ secrets.MAC_CERT_BUNDLE_ID }}.arm64"
160-
codesign --force --timestamp --sign "Developer ID Application: Magnus Opera (${{ secrets.MAC_DEV_TEAM_ID }})" .out/darwin/x64/fscript --options=runtime --no-strict --entitlements .out/darwin/entitlements.plist --identifier "${{ secrets.MAC_CERT_BUNDLE_ID }}.x64"
161160
(cd .out/darwin/arm64; zip ../fscript-${{ github.ref_name }}-darwin-arm64.zip ./*)
162-
(cd .out/darwin/x64; zip ../fscript-${{ github.ref_name }}-darwin-x64.zip ./*)
163161
164162
- name: Notarize arm64
165163
uses: GuillaumeFalourd/notary-tools@v1
@@ -172,24 +170,12 @@ jobs:
172170
xcode_path: '/Applications/Xcode_16.4.app'
173171
staple: false
174172

175-
- name: Notarize x64
176-
uses: GuillaumeFalourd/notary-tools@v1
177-
timeout-minutes: 10
178-
with:
179-
product_path: '.out/darwin/fscript-${{ github.ref_name }}-darwin-x64.zip'
180-
apple_id: ${{ secrets.MAC_DEV_LOGIN }}
181-
password: ${{ secrets.MAC_DEV_PASSWORD }}
182-
team_id: ${{ secrets.MAC_DEV_TEAM_ID }}
183-
xcode_path: '/Applications/Xcode_16.4.app'
184-
staple: false
185-
186173
- name: Upload signed macOS artifacts
187174
uses: softprops/action-gh-release@v2
188175
with:
189176
tag_name: ${{ github.ref_name }}
190177
files: |
191178
.out/darwin/fscript-${{ github.ref_name }}-darwin-arm64.zip
192-
.out/darwin/fscript-${{ github.ref_name }}-darwin-x64.zip
193179
194180
- name: Remove unsigned macOS artifact
195181
continue-on-error: true

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to FScript are documented in this file.
44

55
## [Unreleased]
66

7+
- Removed macOS Intel release packaging from the release publish workflows and Homebrew asset generation.
8+
79
## [0.71.1]
810

911

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ publish:
3333
dotnet publish -c $(config) --self-contained -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:Version=$(version) -o $(PWD)/.out/dotnet src/FScript
3434

3535
publish-darwin:
36-
dotnet publish -c $(config) -r osx-x64 --self-contained -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:Version=$(version) -o $(PWD)/.out/darwin/x64 src/FScript
3736
dotnet publish -c $(config) -r osx-arm64 --self-contained -p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:Version=$(version) -o $(PWD)/.out/darwin/arm64 src/FScript
3837

3938
publish-linux:

0 commit comments

Comments
 (0)