disable macos 11. long queues. ref actions/runner-images#2247 (comment)

ysoftwareab · Jan 11, 2021 · e252c90 · e252c90
1 parent 08d65c7
commit e252c90
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows.src/main.yml b/.github/workflows.src/main.yml
@@ -84,7 +84,9 @@ jobs:
           - ubuntu-18.04
           - ubuntu-20.04
           - macos-10.15
-          - macos-11.0
+          # FIXME macos 11 has long queues
+          # see https://github.com/actions/virtual-environments/issues/2247#issuecomment-757577274
+          # - macos-11.0
         sf_ci_brew_install:
           - minimal
           - dev

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -23,7 +23,6 @@ jobs:
           - ubuntu-18.04
           - ubuntu-20.04
           - macos-10.15
-          - macos-11.0
         sf_ci_brew_install:
           - minimal
           - dev
@@ -103,7 +102,7 @@ jobs:
           SLACK_CHANNEL: cloud-ci
           CI_STATUS: '${{ job.status }}'
         run: ./.ci.sh notifications || true
-  main-container:
+  container:
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -120,15 +119,15 @@ jobs:
         sf_ci_brew_install:
           - minimal
           - dev
-    name: 'main-container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}'
+    name: 'container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}'
     runs-on: ubuntu-latest
     env:
       GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
       SF_LOG_BOOTSTRAP: true
       SF_PRINTENV_BOOTSTRAP: '${{ secrets.SF_PRINTENV_BOOTSTRAP }}'
       SF_TRANSCRYPT_PASSWORD: '${{ secrets.SF_TRANSCRYPT_PASSWORD }}'
       V: '${{ secrets.V }}'
-      GITHUB_JOB_NAME: 'main-container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}'
+      GITHUB_JOB_NAME: 'container-${{ matrix.container }}-${{ matrix.sf_ci_brew_install }}'
       GITHUB_MATRIX_CONTAINER: '${{ matrix.container }}'
       GITHUB_MATRIX_SF_CI_BREW_INSTALL: '${{ matrix.sf_ci_brew_install }}'
       SF_CI_BREW_INSTALL: minimal
@@ -207,15 +206,15 @@ jobs:
           - windows-2019
         sf_ci_brew_install:
           - minimal
-    name: 'main-windows-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}'
+    name: 'main-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}'
     runs-on: '${{ matrix.os }}'
     env:
       GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
       SF_LOG_BOOTSTRAP: true
       SF_PRINTENV_BOOTSTRAP: '${{ secrets.SF_PRINTENV_BOOTSTRAP }}'
       SF_TRANSCRYPT_PASSWORD: '${{ secrets.SF_TRANSCRYPT_PASSWORD }}'
       V: '${{ secrets.V }}'
-      GITHUB_JOB_NAME: 'main-windows-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}'
+      GITHUB_JOB_NAME: 'main-${{ matrix.os }}-${{ matrix.sf_ci_brew_install }}'
       SF_CI_BREW_INSTALL: '${{ matrix.sf_ci_brew_install }}'
       WSLENV: >-
         CI:V:SF_LOG_BOOTSTRAP:SF_PRINTENV_BOOTSTRAP:GH_TOKEN:GH_USERNAME:SF_TRANSCRYPT_PASSWORD:SLACK_WEBHOOK:SLACK_CHANNEL:CI_STATUS:SF_CI_BREW_INSTALL