annocheck: de-matrix

This workflow have never needed matrix since its birth.

1 files changed, 32 insertions, 62 deletions

diff --git a/.github/workflows/annocheck.yml b/.github/workflows/annocheck.yml
index 1127a121ca..8a423b0839 100644
--- a/.github/workflows/annocheck.yml
+++ b/.github/workflows/annocheck.yml
@@ -27,70 +27,45 @@ concurrency:
   group: ${{ github.workflow }} / ${{ startsWith(github.event_name, 'pull') && github.ref_name || github.sha }}
   cancel-in-progress: ${{ startsWith(github.event_name, 'pull') }}
 
-# GitHub actions does not support YAML anchors.  This creative use of
-# environment variables (plus the "echo $GITHUB_ENV" hack) is to reroute that
-# restriction.
-env:
-  default_cc: clang-15
-  append_cc: ''
-
-  # -O1 is faster than -O3 in our tests... Majority of time are consumed trying
-  # to optimize binaries.  Also GitHub Actions run on relatively modern CPUs
-  # compared to, say, GCC 4 or Clang 3.  We don't specify `-march=native`
-  # because compilers tend not understand what the CPU is.
-  optflags: '-O1'
-
-  # -g0 disables backtraces when SEGV.  Do not set that.
-  debugflags: '-ggdb3'
-
-  default_configure: >-
-    --enable-debug-env
-    --disable-install-doc
-    --with-ext=-test-/cxxanyargs,+
-  append_configure: >-
-    --without-valgrind
-    --without-jemalloc
-    --without-gmp
-
-  CONFIGURE_TTY: never
-  GITPULLOPTIONS: --no-tags origin ${{github.ref}}
-  RUBY_DEBUG: ci rgengc
-  RUBY_TESTOPTS: >-
-    -q
-    --color=always
-    --tty=no
-
 permissions:
   contents: read
 
 jobs:
   compile:
-    strategy:
-      fail-fast: false
-      matrix:
-        env:
-          - {}
-        entry:
-          - name: 'gcc-11 annocheck'
-            container: gcc-11
-            env:
-              # Minimal flags to pass the check.
-              default_cc: 'gcc-11 -fcf-protection -Wa,--generate-missing-build-notes=yes'
-              optflags: '-O2'
-              LDFLAGS: '-Wl,-z,now'
-              # FIXME: Drop skipping options
-              # https://bugs.ruby-lang.org/issues/18061
-              # https://sourceware.org/annobin/annobin.html/Test-pie.html
-              TEST_ANNOCHECK_OPTS: '--skip-pie --skip-gaps'
-            check: true
-
-    name: ${{ matrix.entry.name }}
+    name: gcc-11 annocheck
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/ruby/ruby-ci-image:${{ matrix.entry.container || matrix.entry.env.default_cc || 'clang-15' }}
+      image: ghcr.io/ruby/ruby-ci-image:gcc-11
       options: --user root
     if: ${{ !contains(github.event.head_commit.message, '[DOC]') && !contains(github.event.pull_request.labels.*.name, 'Documentation') }}
-    env: ${{ matrix.entry.env || matrix.env }}
+    env:
+      # -g0 disables backtraces when SEGV.  Do not set that.
+      debugflags: '-ggdb3'
+
+      default_configure: >-
+        --enable-debug-env
+        --disable-install-doc
+        --with-ext=-test-/cxxanyargs,+
+      append_configure: >-
+        --without-valgrind
+        --without-jemalloc
+        --without-gmp
+
+      CONFIGURE_TTY: never
+      GITPULLOPTIONS: --no-tags origin ${{github.ref}}
+      RUBY_DEBUG: ci rgengc
+      RUBY_TESTOPTS: >-
+        -q
+        --color=always
+        --tty=no
+      # Minimal flags to pass the check.
+      optflags: '-O2'
+      LDFLAGS: '-Wl,-z,now'
+      # FIXME: Drop skipping options
+      # https://bugs.ruby-lang.org/issues/18061
+      # https://sourceware.org/annobin/annobin.html/Test-pie.html
+      TEST_ANNOCHECK_OPTS: '--skip-pie --skip-gaps'
+
     steps:
       - run: id
         working-directory:
@@ -106,12 +81,8 @@ jobs:
       - name: Run configure
         run: >
           ../src/configure -C ${default_configure} ${append_configure}
-          --${{
-            matrix.entry.crosshost && 'host' || 'with-gcc'
-          }}=${{
-            matrix.entry.crosshost || '"${default_cc}${append_cc:+ $append_cc}"'
-          }}
-          --${{ matrix.entry.shared || 'enable' }}-shared
+          --with-gcc="gcc-11 -fcf-protection -Wa,--generate-missing-build-notes=yes"
+          --enable-shared
       - run: make showflags
       - run: make
       - run: make test
@@ -126,7 +97,6 @@ jobs:
       - run: make test-annocheck
       - uses: ./.github/actions/slack
         with:
-          label: ${{ matrix.entry.name }}
           SLACK_WEBHOOK_URL: ${{ secrets.SIMPLER_ALERTS_URL }} # ruby-lang slack: ruby/simpler-alerts-bot
         if: ${{ failure() && github.event_name == 'push' }}