Tweak CI versions: move the world forward (#76)

paulo-ferraz-oliveira · Sep 21, 2024 · 7fb0360 · 7fb0360
1 parent 900259b
commit 7fb0360
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -4,5 +4,4 @@ A brief description of your changes.
 
 Closes #&lt;issue&gt;.
 
-- [ ] I have performed a self-review of my changes
 - [ ] I have read and understood the [contributing guidelines](/paulo-ferraz-oliveira/rebar3_checkshell/blob/main/CONTRIBUTING.md)
diff --git a/.github/workflows/erlang.yml b/.github/workflows/erlang.yml
@@ -20,8 +20,6 @@ jobs:
       windows: 2022
       # renovate datasource: github-runners, depName: macos
       macos: 14
-      # renovate datasource: github-tags, depName: erlang/rebar3
-      rebar3: 3.24.0
 
     steps:
       - run: echo "versions set!"
@@ -36,29 +34,10 @@ jobs:
         include:
           - os-base: ubuntu
             os-vsn: ${{ needs.vsns.outputs.ubuntu }}
-            otp-version: 25
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
-          - os-base: ubuntu
-            os-vsn: ${{ needs.vsns.outputs.ubuntu }}
-            otp-version: 26
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
           - os-base: windows
             os-vsn: ${{ needs.vsns.outputs.windows }}
-            otp-version: 25
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
-          - os-base: windows
-            os-vsn: ${{ needs.vsns.outputs.windows }}
-            otp-version: 26
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
-          # macos, for now, is considered best-effort
-          - os-base: macos
-            os-vsn: ${{ needs.vsns.outputs.macos }}
-            otp-version: 25
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
           - os-base: macos  # macos, for now, is considered best-effort
             os-vsn: ${{ needs.vsns.outputs.macos }}
-            otp-version: 26
-            rebar3-version: ${{ needs.vsns.outputs.rebar3 }}
 
     runs-on: ${{matrix.os-base}}-${{matrix.os-vsn}}
 
@@ -68,12 +47,15 @@ jobs:
       - uses: erlef/setup-beam@b9c58b0450cd832ccdb3c17cc156a47065d2114f # v1.18.1
         id: setup-beam
         with:
-          otp-version: ${{matrix.otp-version}}
-          rebar3-version: ${{matrix.rebar3-version}}
+          version-type: strict
+          version-file: .tool-versions
         if: ${{matrix.os-base != 'macos'}}
 
       - run: |
-          brew install erlang@${{matrix.otp-version}}
+          # there be dragons
+          brew update
+          erlang=$(< .tool-versions grep erlang | sed -E 's/erlang ([^\.]+).*/\1/g')
+          brew install "erlang@${erlang}"
           brew install rebar3
         if: ${{matrix.os-base == 'macos'}}