Add OTP-26 to CI; use container-based build

epgsql · May 17, 2023 · 996d768 · 996d768
1 parent 008cc33
commit 996d768
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,32 +10,25 @@ jobs:
   ci:
     name: Run checks and tests over ${{matrix.otp}} and ${{matrix.os}}
     runs-on: ${{matrix.os}}
+    container:
+      image: erlang:${{ matrix.otp }}
 
     strategy:
       fail-fast: false
       matrix:
-        otp: ["25.3", "24.3"]
+        otp: ["26.0", "25.3", "24.3"]
         os: ["ubuntu-22.04"]
-        rebar3: ["3.20.0"]
         include:
           - otp: "23.3"
             os: "ubuntu-20.04"
-            rebar3: "3.17.0"
           - otp: "22.3"
             os: "ubuntu-20.04"
-            rebar3: "3.17.0"
           - otp: "21.3"
             os: "ubuntu-20.04"
-            rebar3: "3.15.2"
 
     steps:
       - uses: actions/checkout@v3
 
-      - uses: erlef/setup-beam@v1
-        with:
-          otp-version: ${{ matrix.otp }}
-          rebar3-version: ${{ matrix.rebar3 }}
-
       - name: Compile
         run: make
 

diff --git a/.github/workflows/hot_upgrade.yml b/.github/workflows/hot_upgrade.yml
@@ -10,26 +10,26 @@ jobs:
   ci:
     name: Hot code upgrade from ${{ matrix.from_version }} on OTP-${{ matrix.otp }}
     runs-on: ${{matrix.os}}
+    container:
+      image: erlang:${{ matrix.otp }}
 
     strategy:
       fail-fast: true
       matrix:
         os: ["ubuntu-20.04"]
         otp: ["23.3"]
-        rebar3: ["3.17.0"]
         from_version:
             - "1.5.2"
             - "9c28fb479f9329e2a1644565a632bc222780f1b7"
 
     steps:
+      # This is to not have the git safe.directory failure
+      - name: Change owner of container working directory
+        run: chown root:root .
+
       - uses: actions/checkout@v3
         with:
             fetch-depth: 0
 
-      - uses: erlef/setup-beam@v1
-        with:
-          otp-version: ${{ matrix.otp }}
-          rebar3-version: ${{ matrix.rebar3 }}
-
       - name: Hot-upgrade
         run: make hotupgrade_setup BASE_REV=${{ matrix.from_version }} hotupgrade_check