From 4062f70af51d0721eaaf7a5c9427868847ba2286 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 3 Sep 2024 09:48:14 +0200 Subject: [PATCH 1/3] try to increase timeout of github actions for macOS Signed-off-by: Matthieu Gallien --- .github/workflows/macos-build-and-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index 9610fc4cbadd0..55795ac5ae06d 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -5,6 +5,7 @@ on: jobs: build: name: macOS Build and Test + timeout-minutes: 60 runs-on: macos-14 strategy: matrix: From 4ac601e17ee2fe3d2c73d0c5b3b5ec788e21bfc8 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 3 Sep 2024 13:48:43 +0200 Subject: [PATCH 2/3] no longer use deprecated Craft command line option Signed-off-by: Matthieu Gallien --- .github/workflows/macos-build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index 55795ac5ae06d..3581b6a1df601 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -62,7 +62,7 @@ jobs: - name: Build client run: | - python "${{ env.CRAFT_MASTER_LOCATION }}/CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c --src-dir ${{ github.workspace }} ${{ env.CRAFT_BLUEPRINT_OPTIONS }} nextcloud-client + python "${{ env.CRAFT_MASTER_LOCATION }}/CraftMaster.py" --config "${{ env.CRAFT_MASTER_CONFIG }}" --target ${{ env.CRAFT_TARGET }} -c --options nextcloud-client.srcDir=${{ github.workspace }} ${{ env.CRAFT_BLUEPRINT_OPTIONS }} nextcloud-client - name: Run tests run: | From b14e38c2ac9f34e9884b391f11b1fda89f34d4a0 Mon Sep 17 00:00:00 2001 From: Matthieu Gallien Date: Tue, 3 Sep 2024 16:00:39 +0200 Subject: [PATCH 3/3] CI fix warning: inkscape was renamed to homebrew/cask/inkscape Signed-off-by: Matthieu Gallien --- .github/workflows/macos-build-and-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/macos-build-and-test.yml b/.github/workflows/macos-build-and-test.yml index 3581b6a1df601..f6c59d4910f06 100644 --- a/.github/workflows/macos-build-and-test.yml +++ b/.github/workflows/macos-build-and-test.yml @@ -42,7 +42,7 @@ jobs: - name: Install Homebrew dependencies run: | - brew install inkscape + brew install homebrew/cask/inkscape - name: Download Craft run: |