From 6321fbe70d7a52a57f9c200db20f4b0ae6882474 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 13 Sep 2024 10:48:05 +1000
Subject: [PATCH 1/3] fix: disable macos-14 build as we hit our free tier macos
build limit
---
.github/workflows/build-binaries.yml | 3 ++-
.github/workflows/pull-request.yml | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 66fa53ba4..d08918d1a 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -25,7 +25,8 @@ jobs:
fail-fast: false
matrix:
# We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
- os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+ # macos-14 is disabled for now as we hit our free tier limit for macos builds
+ os: [windows-2022, ubuntu-20.04, macos-12]
env:
SIGNAL_ENV: production
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fa29f0bfe..ad6e7b96f 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -20,7 +20,8 @@ jobs:
fail-fast: false
matrix:
# We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
- os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+ # macos-14 is disabled for now as we hit our free tier limit for macos builds
+ os: [windows-2022, ubuntu-20.04, macos-12]
env:
SIGNAL_ENV: production
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
From 3551adf25ca8e93e8f278ffb87a7215f8149bbae Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Fri, 13 Sep 2024 10:53:33 +1000
Subject: [PATCH 2/3] chore: bump upload-artifact action version
---
.github/workflows/build-binaries.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index d08918d1a..bfff23c64 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -77,7 +77,7 @@ jobs:
working-directory: ./release/
- name: Upload Production Artifacts
- uses: actions/upload-artifact@v1
+ uses: actions/upload-artifact@v4
with:
name: ${{ runner.os }}-${{ runner.arch }}-production
path: release
From 5d9261d9f1456019c2b1cdc8a5ef86d50a944646 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@getsession.org>
Date: Mon, 23 Sep 2024 15:58:52 +1000
Subject: [PATCH 3/3] chore: run workflows on branches matching release&ci/**
---
.github/workflows/build-binaries.yml | 9 +++++----
.github/workflows/pull-request.yml | 4 ++--
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index 66fa53ba4..570951a61 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -6,14 +6,15 @@ on:
branches:
- clearnet
- unstable
- - release/
- - ci/
+ - 'release/**'
+ - 'ci/**'
pull_request:
branches:
- clearnet
- unstable
- - release/
- - ci/
+ - 'release/**'
+ - 'ci/**'
+
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
index fa29f0bfe..c5a0072a9 100644
--- a/.github/workflows/pull-request.yml
+++ b/.github/workflows/pull-request.yml
@@ -6,8 +6,8 @@ on:
branches:
- clearnet
- unstable
- - release/
- - ci/
+ - 'release/**'
+ - 'ci/**'
concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}