From a212f0611752a63cf67d5475fc30777ad94fb8c7 Mon Sep 17 00:00:00 2001 From: MordechaiHadad Date: Sun, 4 Dec 2022 10:24:26 +0200 Subject: [PATCH 1/5] ci: Add macos arm support --- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ resources/tapes/demo.tape | 14 ++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 resources/tapes/demo.tape diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3d1f895..ac5b801 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -61,6 +61,37 @@ jobs: if-no-files-found: error retention-days: 7 + macos-m1: + runs-on: macos-latest + steps: + - uses: actions/checkout@v2 + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + target: aarch64-apple-darwin + profile: minimal + override: true + - uses: Swatinem/rust-cache@v1 + - name: Build Bob + uses: actions-rs/cargo@v1 + with: + command: build + args: --profile optimized + - name: Check lints + uses: actions-rs/cargo@v1 + with: + command: clippy + args: --verbose -- -D warnings + - name: Upload Bob M1 MacOS binary + uses: actions/upload-artifact@v2 + with: + name: "bob-macos-arm" + path: "target/optimized/bob" + if-no-files-found: error + retention-days: 7 + + windows: runs-on: windows-latest steps: diff --git a/resources/tapes/demo.tape b/resources/tapes/demo.tape new file mode 100644 index 0000000..e8af6cd --- /dev/null +++ b/resources/tapes/demo.tape @@ -0,0 +1,14 @@ +Output demo.gif + +Require bob + +Set FontSize 32 +Set Width 1200 +Set Height 600 +Set LoopOffset 50% + +Type bob use +Sleep 500ms +Enter + +Sleep 5s From b9d2023a2b29d1d61f7e22500dbd035888c4573a Mon Sep 17 00:00:00 2001 From: MordechaiHadad Date: Sun, 4 Dec 2022 14:43:17 +0200 Subject: [PATCH 2/5] ci: change from toolchain target to build command target --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ac5b801..4712d69 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,6 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - target: aarch64-apple-darwin profile: minimal override: true - uses: Swatinem/rust-cache@v1 @@ -77,7 +76,7 @@ jobs: uses: actions-rs/cargo@v1 with: command: build - args: --profile optimized + args: --profile optimized --target aarch64-apple-darwin - name: Check lints uses: actions-rs/cargo@v1 with: From ffc7df79e78c9fa4d446f281803b82e2403d17f2 Mon Sep 17 00:00:00 2001 From: MordechaiHadad Date: Sun, 4 Dec 2022 14:52:11 +0200 Subject: [PATCH 3/5] ci(build): m1 fix --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4712d69..cd1b5ad 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,6 +69,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable + traget: aarch64-apple-darwin profile: minimal override: true - uses: Swatinem/rust-cache@v1 From 487c458dd220e61a51884db0c63a6fddff7687c2 Mon Sep 17 00:00:00 2001 From: MordechaiHadad Date: Sun, 4 Dec 2022 14:58:47 +0200 Subject: [PATCH 4/5] ci(build): misspelled target --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cd1b5ad..9b64371 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,7 @@ jobs: uses: actions-rs/toolchain@v1 with: toolchain: stable - traget: aarch64-apple-darwin + target: aarch64-apple-darwin profile: minimal override: true - uses: Swatinem/rust-cache@v1 From 83f35ff5cc9d155d6ac9e6fd6e1bdb2174c0bb13 Mon Sep 17 00:00:00 2001 From: MordechaiHadad Date: Tue, 6 Dec 2022 12:48:55 +0200 Subject: [PATCH 5/5] CI(build): trying to see if I chose the wrong path --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9b64371..60a9873 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -87,7 +87,7 @@ jobs: uses: actions/upload-artifact@v2 with: name: "bob-macos-arm" - path: "target/optimized/bob" + path: "target/aarch64-apple-darwin/optimized/bob" if-no-files-found: error retention-days: 7