Skip to content

Commit c2d44b9

Browse files
authored
Merge pull request #98 from Jayy001/Eeems-patch-1
Add intel macOS build
2 parents be75774 + 846bd60 commit c2d44b9

2 files changed

Lines changed: 47 additions & 30 deletions

File tree

.github/workflows/main.yml

Lines changed: 45 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,28 @@ on:
44
branches:
55
- main
66
paths:
7-
- requirements.txt
8-
- requirements.remote.txt
9-
- '*.py'
10-
- data/**
11-
- codexctl/**
12-
- scripts/**
13-
- github-make-executable.sh
14-
- Makefile
15-
- .github/workflows/main.yml
7+
- requirements.txt
8+
- requirements.remote.txt
9+
- "*.py"
10+
- data/**
11+
- codexctl/**
12+
- scripts/**
13+
- github-make-executable.sh
14+
- Makefile
15+
- .github/workflows/main.yml
1616
push:
1717
branches:
1818
- main
1919
paths:
20-
- requirements.txt
21-
- requirements.remote.txt
22-
- '*.py'
23-
- data/**
24-
- codexctl/**
25-
- scripts/**
26-
- github-make-executable.sh
27-
- Makefile
28-
- .github/workflows/main.yml
20+
- requirements.txt
21+
- requirements.remote.txt
22+
- "*.py"
23+
- data/**
24+
- codexctl/**
25+
- scripts/**
26+
- github-make-executable.sh
27+
- Makefile
28+
- .github/workflows/main.yml
2929
workflow_dispatch:
3030

3131
defaults:
@@ -42,6 +42,7 @@ jobs:
4242
- ubuntu-latest
4343
- windows-latest
4444
- macos-latest
45+
- macos-15-intel
4546
runs-on: ${{ matrix.os }}
4647
steps:
4748
- name: Install Apt packages
@@ -53,7 +54,7 @@ jobs:
5354
packages: libfuse-dev
5455
version: 1.0
5556
- name: Install brew packages
56-
if: matrix.os == 'macos-latest'
57+
if: matrix.os == 'macos-latest' || matrix.os == 'macos-15-intel'
5758
run: brew install coreutils
5859
- name: Checkout the Git repository
5960
uses: actions/checkout@v4
@@ -70,8 +71,8 @@ jobs:
7071
nuitka_cache: ${{ github.workspace }}/.nuitka
7172
- uses: actions/setup-python@v5
7273
with:
73-
python-version: '3.12'
74-
cache: 'pip'
74+
python-version: "3.12"
75+
cache: "pip"
7576
cache-dependency-path: |
7677
**/requirements*.txt
7778
- name: Test codexctl
@@ -86,7 +87,7 @@ jobs:
8687
nuitka_cache: ${{ github.workspace }}/.nuitka
8788
- name: Upload Compilation Report
8889
uses: actions/upload-artifact@v4
89-
if: (success() || failure()) && runner.debug == '1'
90+
if: (success() || failure()) && runner.debug == '1'
9091
with:
9192
name: ${{ matrix.os }}-compilation-report
9293
path: compilation-report.xml
@@ -163,9 +164,9 @@ jobs:
163164
./scripts/github-make-executable.sh
164165
- name: Upload Compilation Report
165166
uses: actions/upload-artifact@v4
166-
if: runner.debug == '1'
167+
if: runner.debug == '1'
167168
with:
168-
name: ${{ matrix.os }}-compilation-report
169+
name: remarkable-compilation-report
169170
path: compilation-report.xml
170171
if-no-files-found: warn
171172
- name: Upload executable
@@ -181,24 +182,40 @@ jobs:
181182
strategy:
182183
matrix:
183184
fw_version:
184-
- '2.15.1'
185-
- '3.3.2'
185+
- "2.15.1"
186+
- "3.3.2"
186187
# - '3.9.3'
187188
steps:
188189
- uses: actions/download-artifact@v4
189190
with:
190191
path: artifacts
191192
name: remarkable
193+
- name: Free up space
194+
run: |
195+
export DEBIAN_FRONTEND="noninteractive"
196+
sudo apt-get autoremove -y
197+
sudo apt-get autoclean -y
198+
sudo rm -rf \
199+
/usr/lib/jvm \
200+
/usr/share/dotnet \
201+
/usr/share/swift \
202+
/usr/local/.ghcup \
203+
/usr/local/julia* \
204+
/usr/local/lib/android \
205+
/usr/local/share/chromium \
206+
/opt/microsoft /opt/google \
207+
/opt/az \
208+
/usr/local/share/powershell
192209
- uses: Eeems-Org/run-in-remarkable-action@v1
193210
with:
194211
path: artifacts
195212
fw_version: ${{ matrix.fw_version }}
196213
run: |
197214
chmod +x ./codexctl
198-
./codexctl download --hardware rm2 --out /tmp toltec
215+
./codexctl download --hardware rm2 --out /tmp toltec
199216
release:
200217
name: Release
201-
needs: [remote,device,test_device]
218+
needs: [remote, device, test_device]
202219
runs-on: ubuntu-latest
203220
if: github.ref == 'refs/heads/main'
204221
permissions:

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
requests==2.32.4
22
loguru==0.7.3
3-
remarkable-update-image==1.3; sys_platform != 'linux'
4-
remarkable-update-fuse==1.3; sys_platform == 'linux'
3+
remarkable-update-image==1.3.1; sys_platform != 'linux'
4+
remarkable-update-fuse==1.3.1; sys_platform == 'linux'

0 commit comments

Comments
 (0)