Skip to content

Commit 593f94c

Browse files
nicolasnoblenicolasnoble
authored
Merge pull request #1991 from nicolasnoble/remove-macos-intel-ci
Remove macOS Intel CI pipeline
2 parents 45fcccd + ad61632 commit 593f94c

2 files changed

Lines changed: 1 addition & 127 deletions

File tree

‎.github/workflows/macos-build.yml‎

Lines changed: 0 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -38,131 +38,6 @@ jobs:
3838
name: tests
3939
path: '**/*.ps-exe'
4040

41-
macos-intel-build-and-test:
42-
runs-on: macos-13
43-
needs: build-openbios
44-
steps:
45-
- uses: actions/checkout@v1
46-
- uses: n1hility/cancel-previous-runs@v2
47-
with:
48-
token: ${{ secrets.GITHUB_TOKEN }}
49-
- name: Install dependencies
50-
run: ./.github/scripts/install-brew-dependencies.sh
51-
- name: Fetch submodules
52-
run: git submodule update --init --recursive
53-
- name: Build PCSX-Redux
54-
run: make -j 2 all pcsx-redux-tests
55-
- name: Download OpenBIOS build
56-
uses: actions/download-artifact@v4
57-
with:
58-
name: OpenBIOS
59-
- name: Download mips tests
60-
uses: actions/download-artifact@v4
61-
with:
62-
name: tests
63-
- name: Bundle
64-
run: ./.github/scripts/create-app.sh
65-
- name: Create BUILD environment
66-
run: echo "BUILD=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
67-
- name: Injecting OpenBIOS
68-
run: cp openbios.bin PCSX-Redux.app/Contents/Resources/share/pcsx-redux/resources
69-
- name: Install node
70-
uses: actions/setup-node@v4
71-
with:
72-
node-version: '22.6.0'
73-
- name: Install jq
74-
run: |
75-
brew install jq
76-
- name: Packaging
77-
env:
78-
APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_DEV_MACOS_X64 }}
79-
APPDISTRIB_ORGANIZATION: pcsx-redux
80-
APPDISTRIB_PROJECT: dev-macos-x64
81-
run: |
82-
npx @appdistrib/cli buildid > buildid.json
83-
echo '{' > version.json
84-
echo ' "version": "'`git rev-parse HEAD | cut -c 1-8`'",' >> version.json
85-
echo ' "buildId": '`jq -r .buildid buildid.json`',' >> version.json
86-
echo ' "changeset": "'`git rev-parse HEAD`'",' >> version.json
87-
echo ' "timestamp": '`date '+%s'`',' >> version.json
88-
echo ' "channel": "dev",' >> version.json
89-
echo ' "updateInfo": [' >> version.json
90-
echo ' {' >> version.json
91-
echo ' "channel": "dev",' >> version.json
92-
echo ' "method": "appdistrib",' >> version.json
93-
echo ' "updateCatalog": "https://distrib.app/storage/manifests/pcsx-redux/dev-macos-x64/manifest.json",' >> version.json
94-
echo ' "updateInfoBase": "https://distrib.app/storage/manifests/pcsx-redux/dev-macos-x64/",' >> version.json
95-
echo ' "updateStorageUrl": "https://distrib.app/"' >> version.json
96-
echo ' }' >> version.json
97-
echo ' ]' >> version.json
98-
echo '}' >> version.json
99-
cp version.json PCSX-Redux.app/Contents/Resources/share/pcsx-redux/resources/version.json
100-
- name: Signing Application
101-
run: codesign --force -s - -vvvv PCSX-Redux.app
102-
- name: Adjusting for dmg folder
103-
run: |
104-
mkdir dmgdir
105-
mv PCSX-Redux.app dmgdir
106-
cp dmgdir/PCSX-Redux.app/Contents/Resources/AppIcon.icns .
107-
- name: Creating dmg icon
108-
run: |
109-
sips -i AppIcon.icns
110-
DeRez -only icns AppIcon.icns > icns.rsrc
111-
cp AppIcon.icns dmgdir/.VolumeIcon.icns
112-
SetFile -c icnC dmgdir/.VolumeIcon.icns
113-
SetFile -a C dmgdir
114-
- name: Creating Application link
115-
run: ln -s /Applications dmgdir
116-
- name: Creating dmg file
117-
run: hdiutil create -volname PCSX-Redux-$BUILD -srcfolder dmgdir -ov -format UDZO PCSX-Redux-$BUILD-Intel.dmg
118-
- name: Applying icon to dmg file
119-
run: |
120-
Rez -append icns.rsrc -o PCSX-Redux-$BUILD-Intel.dmg
121-
SetFile -a C PCSX-Redux-$BUILD-Intel.dmg
122-
- name: Removing temporary dmg folder
123-
run: rm -rf dmgdir
124-
- name: Upload DMG
125-
uses: actions/upload-artifact@v4
126-
with:
127-
name: Dmg-intel
128-
path: '**/*.dmg'
129-
- name: Upload version
130-
uses: actions/upload-artifact@v4
131-
with:
132-
name: Version-intel
133-
path: version.json
134-
135-
publish-intel-app:
136-
runs-on: ubuntu-latest
137-
needs: macos-intel-build-and-test
138-
if: github.event_name == 'push'
139-
steps:
140-
- uses: actions/checkout@v1
141-
- uses: n1hility/cancel-previous-runs@v2
142-
with:
143-
token: ${{ secrets.GITHUB_TOKEN }}
144-
- name: Install node
145-
uses: actions/setup-node@v4
146-
with:
147-
node-version: '22.6.0'
148-
- name: Create BUILD environment
149-
run: echo "BUILD=`echo ${GITHUB_SHA} | cut -c1-8`" >> $GITHUB_ENV
150-
- name: Download DMG
151-
uses: actions/download-artifact@v4
152-
with:
153-
name: Dmg-intel
154-
- name: Download version
155-
uses: actions/download-artifact@v4
156-
with:
157-
name: Version-intel
158-
- name: Distribute app
159-
env:
160-
APPDISTRIB_TOKEN: ${{ secrets.APPDISTRIB_DEV_MACOS_X64 }}
161-
APPDISTRIB_ORGANIZATION: pcsx-redux
162-
APPDISTRIB_PROJECT: dev-macos-x64
163-
run: |
164-
npx @appdistrib/cli -l buildId -m version.json upload PCSX-Redux-$BUILD-Intel.dmg
165-
16641
macos-arm-build-and-test:
16742
runs-on: macos-14
16843
needs: build-openbios

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
|--------|------------|--------|
77
|Windows x64 build|[![Windows x64 CI](https://dev.azure.com/grumpycoders/pcsx-redux/_apis/build/status/grumpycoders.pcsx-redux?branchName=main)](https://dev.azure.com/grumpycoders/pcsx-redux/_build/latest?definitionId=1&branchName=main)|[Windows Intel 64-bits](https://distrib.app/pub/org/pcsx-redux/project/dev-win-x64)|
88
|Linux x64 build|[![Linux x64 CI](https://github.com/grumpycoders/pcsx-redux/workflows/Linux%20CI/badge.svg?branch=main)](https://github.com/grumpycoders/pcsx-redux/actions?query=workflow%3A%22Linux+CI%22+branch%3Amain)|[Linux Intel 64-bits (AppImage)](https://distrib.app/pub/org/pcsx-redux/project/dev-linux-x64)|
9-
|MacOS x64 build|[![MacOS x64 CI](https://github.com/grumpycoders/pcsx-redux/workflows/macOS%20CI/badge.svg?branch=main)](https://github.com/grumpycoders/pcsx-redux/actions?query=workflow%3A%22macOS+CI%22+branch%3Amain)|[MacOS Intel](https://distrib.app/pub/org/pcsx-redux/project/dev-macos-x64)|
9+
|macOS build|[![macOS CI](https://github.com/grumpycoders/pcsx-redux/workflows/macOS%20CI/badge.svg?branch=main)](https://github.com/grumpycoders/pcsx-redux/actions?query=workflow%3A%22macOS+CI%22+branch%3Amain)|[macOS Arm](https://distrib.app/pub/org/pcsx-redux/project/dev-macos-arm)|
1010

1111
To discuss this emulator specifically, please join our Discord server:
1212

@@ -37,7 +37,6 @@ The [tools](tools) directory contains a few tools that can be used to work with
3737
|[Windows Intel 64-bits](https://distrib.app/pub/org/pcsx-redux/project/dev-win-x64)|
3838
|[Windows Intel 64-bits CLI](https://distrib.app/pub/org/pcsx-redux/project/dev-win-cli-x64)|
3939
|[Linux Intel 64-bits (AppImage)](https://distrib.app/pub/org/pcsx-redux/project/dev-linux-x64)|
40-
|[MacOS Intel](https://distrib.app/pub/org/pcsx-redux/project/dev-macos-x64)|
4140
|[MacOS Arm](https://distrib.app/pub/org/pcsx-redux/project/dev-macos-arm)|
4241

4342
### Note:

0 commit comments

Comments
 (0)