From 79bee8ccc0c5895519eeb93b253165fc68454ee3 Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Mon, 11 Nov 2024 14:35:09 +0100 Subject: [PATCH 1/7] ci: use macos-12 runner --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index d9c1a04b..54c213ce 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -67,7 +67,7 @@ jobs: - os: ubuntu-latest executable: bright-cli-linux-x64 node: 20 - - os: macos-11 + - os: macos-12 executable: bright-cli-macos-x64 node: 20 - os: macos-latest From a82517fa427a3e52a0552b6d8ccb7b79f0f5539f Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Mon, 11 Nov 2024 15:37:33 +0100 Subject: [PATCH 2/7] ci: use macos-13 for docker --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 54c213ce..83090e85 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -187,7 +187,7 @@ jobs: fail-fast: false matrix: # Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143 - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] steps: - name: Install Docker (MacOS) if: ${{ startsWith(matrix.os, 'macos') }} From 1f22af0debe43f61a462de70128f7017f334ea50 Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Mon, 11 Nov 2024 15:43:44 +0100 Subject: [PATCH 3/7] ci: use brew and colima for macos arm --- .github/workflows/e2e.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 83090e85..38cb4ca8 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -187,12 +187,14 @@ jobs: fail-fast: false matrix: # Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143 - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-latest] steps: - name: Install Docker (MacOS) if: ${{ startsWith(matrix.os, 'macos') }} - uses: docker-practice/actions-setup-docker@master timeout-minutes: 12 + run: | + brew install docker + colima start - name: Pull Image run: docker pull brightsec/cli:${{ inputs.version }} From 6702ef51b8723613bbc163b608361206cdb3c9cd Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Mon, 11 Nov 2024 15:59:11 +0100 Subject: [PATCH 4/7] ci: install colima before start --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 38cb4ca8..09794418 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -193,7 +193,7 @@ jobs: if: ${{ startsWith(matrix.os, 'macos') }} timeout-minutes: 12 run: | - brew install docker + brew install docker colima colima start - name: Pull Image From 51b17d98b37400b35a4f44d7bff9d15b35ca6b3b Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Tue, 12 Nov 2024 00:12:49 +0100 Subject: [PATCH 5/7] ci: use macos-13 --- .github/workflows/e2e.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 09794418..83090e85 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -187,14 +187,12 @@ jobs: fail-fast: false matrix: # Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143 - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest, macos-13] steps: - name: Install Docker (MacOS) if: ${{ startsWith(matrix.os, 'macos') }} + uses: docker-practice/actions-setup-docker@master timeout-minutes: 12 - run: | - brew install docker colima - colima start - name: Pull Image run: docker pull brightsec/cli:${{ inputs.version }} From 13977a411b0bd0d77c7594092c75de81fa4f51db Mon Sep 17 00:00:00 2001 From: Maksadbek Date: Tue, 12 Nov 2024 00:28:16 +0100 Subject: [PATCH 6/7] ci: use macos-13 --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 83090e85..fdc7bac1 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -192,7 +192,7 @@ jobs: - name: Install Docker (MacOS) if: ${{ startsWith(matrix.os, 'macos') }} uses: docker-practice/actions-setup-docker@master - timeout-minutes: 12 + timeout-minutes: 30 - name: Pull Image run: docker pull brightsec/cli:${{ inputs.version }} From 8844a74c5f5a865d4789aca030a8d748b99749a5 Mon Sep 17 00:00:00 2001 From: maksadbek Date: Tue, 12 Nov 2024 11:21:27 +0100 Subject: [PATCH 7/7] Update e2e.yml --- .github/workflows/e2e.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index fdc7bac1..5a6c0d74 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -34,7 +34,7 @@ on: - development test_timeout: description: "Test timeout in seconds" - default: 3600 + default: 5000 jobs: executables: @@ -187,7 +187,7 @@ jobs: fail-fast: false matrix: # Windows can't run linux docker images: https://github.com/actions/runner-images/issues/1143 - os: [ubuntu-latest, macos-13] + os: [ubuntu-latest, macos-latest] steps: - name: Install Docker (MacOS) if: ${{ startsWith(matrix.os, 'macos') }}