Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Chore: Use macos-12 on 2.2.0 #2515

Merged
merged 3 commits into from
May 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/backend-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-latest, windows-2019]
os: [ubuntu-20.04, macos-12, windows-2019]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ jobs:

build-macos:
# needs: run-e2e-tests-mac
runs-on: macos-latest
runs-on: macos-12
if: |
startsWith(github.ref, 'refs/tags/@quiet/desktop')

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-rtl-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-20.04, macos-12]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/desktop-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-20.04, macos-12]

steps:
- uses: dorny/paths-filter@v3
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/e2e-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ on:

jobs:
detox-android:
timeout-minutes: 10
runs-on: [self-hosted, macOS, ARM64, android]
timeout-minutes: 25
runs-on: [macos-14-xlarge]

steps:
- uses: actions/checkout@v4
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/e2e-crossplatform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- packages/state-manager/**
- packages/identity/**
- packages/common/**
- .github/workflows/e2e**

jobs:
mac:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: E2E Mac
on: [workflow_call]
jobs:
mac:
runs-on: macos-latest
runs-on: macos-12
timeout-minutes: 180
env:
ELECTRON_CUSTOM_VERSION: 23.0.0
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:

- name: FILE_NAME env
working-directory: ./packages/desktop/dist
run: echo "FILE_NAME="Quiet-$VERSION-arm64.dmg"" >> $GITHUB_ENV
run: echo "FILE_NAME="Quiet-$VERSION.dmg"" >> $GITHUB_ENV

- name: Chmod
working-directory: ./packages/desktop/dist
Expand All @@ -45,7 +45,7 @@ jobs:
run: hdiutil mount $FILE_NAME

- name: Add App file to applications
run: cd ~ && cp -R "/Volumes/Quiet $VERSION-arm64/Quiet.app" /Applications
run: cd ~ && cp -R "/Volumes/Quiet $VERSION/Quiet.app" /Applications

- name: Run invitation link test - Includes 2 separate application clients
uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/identity-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-latest, windows-2019]
os: [ubuntu-20.04, macos-12, windows-2019]

steps:
- uses: dorny/paths-filter@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mobile-deploy-ios.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:

strategy:
matrix:
os: [macOS-latest]
os: [macos-12]

steps:
- name: "Print OS"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/state-manager-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
os: [ubuntu-20.04, macos-latest]
os: [ubuntu-20.04, macos-12]

steps:
- uses: dorny/paths-filter@v3
Expand Down
29 changes: 29 additions & 0 deletions .github/workflows/utils-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
name: Common package tests

on:
pull_request:
paths:
- packages/common/**

jobs:
utils-tests:
timeout-minutes: 25
runs-on: ${{ matrix.os }}

strategy:
matrix:
os: [ubuntu-20.04, macos-12, windows-2019]

steps:
- name: "Print OS"
run: echo ${{ matrix.os }}

- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- name: "Setup environment"
uses: ./.github/actions/setup-env
with:
bootstrap-packages: "@quiet/eslint-config,@quiet/logger,@quiet/types,@quiet/common"

- name: "Unit tests"
run: lerna run test --scope @quiet/common --stream
Loading