From bb279a60b26b494365717cadf3166f3f781e6eba Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 10:53:38 +0800 Subject: [PATCH 1/6] ci: add concurrency group to reduce excessive building --- .github/workflows/ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 96fa80dc..c855f5ae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,13 @@ # .github/workflows/ci.yml name: CI on: + # Running CI on all commits on all branches (implicitly covers pull request too) push: - branches: - - "**" - pull_request: - branches: [main] + +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: ${{ github.ref_name != 'main' }} + jobs: earthly: runs-on: ubuntu-22.04 From c1b386e5ade1f61d4909a99b984be18a89208270 Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 11:03:04 +0800 Subject: [PATCH 2/6] ci: update earthly to 0.8.15 --- .github/workflows/ci.yml | 2 +- Earthfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c855f5ae..c38f544e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: earthly/actions/setup-earthly@v1 with: - version: v0.7.20 + version: v0.8.15 - uses: actions/checkout@v3 - name: Put back the git branch into git (Earthly uses it for tagging) run: | diff --git a/Earthfile b/Earthfile index 70385429..bf9d72ee 100644 --- a/Earthfile +++ b/Earthfile @@ -1,4 +1,4 @@ -VERSION 0.7 +VERSION 0.8 ARG distro=bullseye FROM --platform=linux/amd64 debian:$distro-slim WORKDIR /libhelium From 47f503a8de397e5817e3edd77ad4cecbcb32dd43 Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 11:04:26 +0800 Subject: [PATCH 3/6] ci: update checkout to v4 --- .github/workflows/ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c38f544e..1094cf2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - uses: earthly/actions/setup-earthly@v1 with: version: v0.8.15 - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Put back the git branch into git (Earthly uses it for tagging) run: | branch="" @@ -35,7 +35,7 @@ jobs: linux: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Build dependencies @@ -49,7 +49,7 @@ jobs: linux-386: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install gcc multi lib @@ -67,7 +67,7 @@ jobs: linux-arm64: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install ARM Tools @@ -85,7 +85,7 @@ jobs: linux-arm: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install ARM Tools @@ -103,7 +103,7 @@ jobs: linux-arm-no-pqc: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install ARM Tools @@ -121,7 +121,7 @@ jobs: linux-riscv64: runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install RISC-V Toolchain @@ -139,7 +139,7 @@ jobs: macos: runs-on: macos-13 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install automake @@ -151,7 +151,7 @@ jobs: macos_arm64: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install automake @@ -171,7 +171,7 @@ jobs: { project: windows_32, arch: x86 }, ] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: gem install ceedling --no-user-install - name: Check Ceedling version @@ -187,7 +187,7 @@ jobs: ios: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install automake @@ -205,7 +205,7 @@ jobs: DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer runs-on: macos-13 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Install automake @@ -219,7 +219,7 @@ jobs: matrix: arch: [armeabi-v7a, arm64-v8a, x86, x86_64] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install Ceedling run: sudo gem install ceedling --no-user-install - name: Run build From bd6bd2dd3cb693ce56a9223b417a6a5ee7f51ce3 Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 11:05:49 +0800 Subject: [PATCH 4/6] ci: test on macos arm64 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1094cf2a..c6ae5fed 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -158,8 +158,8 @@ jobs: run: HOMEBREW_NO_AUTO_UPDATE=1 brew install autoconf automake libtool - name: Build dependencies run: ceedling project:macos_arm64 verbosity[4] clobber dependencies:make - - name: Run build - run: ceedling project:macos_arm64 verbosity[4] release + - name: Run build and test + run: ceedling project:macos_arm64 verbosity[4] test:all windows: runs-on: windows-2022 strategy: From 33a91308555c13b1333a4776646eccac7f911f8a Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 11:07:05 +0800 Subject: [PATCH 5/6] ci: simplify tvos ci --- .github/workflows/ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c6ae5fed..d36f41c9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -201,9 +201,7 @@ jobs: cd ios/Lightway ./build-xcframework.sh tvos: - env: - DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer - runs-on: macos-13 + runs-on: macos-latest steps: - uses: actions/checkout@v4 - name: Install Ceedling From eac50467e0a0d94fdbc366d51bb83313a642b438 Mon Sep 17 00:00:00 2001 From: Raihaan Shouhell Date: Wed, 25 Sep 2024 11:15:42 +0800 Subject: [PATCH 6/6] ci: use new earthly setup action --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d36f41c9..5d95b9a7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,9 +17,9 @@ jobs: env: FORCE_COLOR: 1 steps: - - uses: earthly/actions/setup-earthly@v1 + - uses: earthly/actions-setup@v1 with: - version: v0.8.15 + version: "0.8.15" - uses: actions/checkout@v4 - name: Put back the git branch into git (Earthly uses it for tagging) run: |