Update CI scripts

esl · Nov 20, 2023 · d982031 · d982031
1 parent 17cfd07
commit d982031
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 68 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,28 +9,48 @@ on:
 
 jobs:
   test:
-    name: OTP ${{matrix.otp}}
+    name: OTP ${{matrix.otp}} / rebar3 ${{matrix.rebar3}} / OS ${{matrix.os}}
     strategy:
       matrix:
-        otp: ['24.0', '23.3', '22.3', '21.3']
-    runs-on: 'ubuntu-20.04'
-    env:
-      OTPVER: ${{ matrix.otp }}
+        os: ['ubuntu-22.04']
+        otp: ['26.1', '25.3', '24.3']
+        rebar3: ['3.22.1']
+        include:
+          - otp: '26.1'
+            rebar3: '3.22.1'
+            os: 'windows-2022'
+    runs-on: ${{matrix.os}}
     steps:
-      - uses: actions/checkout@v2
-      - uses: ErlGang/setup-erlang@v1.0.0
+      - uses: actions/checkout@v3
+      - uses: erlef/setup-beam@v1
         with:
-          otp-version: ${{ matrix.otp }}
-      - run: make rebar3
-      - run: make deps
-      - run: make test
-      - run: make dialyzer
-        if: ${{ matrix.otp == '24.0' }}
-      - run: make codecov
-        if: ${{ matrix.otp == '24.0' }}
-      - run: make gcov
-        if: ${{ matrix.otp == '24.0' }}
+          otp-version: ${{matrix.otp}}
+          rebar3-version: ${{matrix.rebar3}}
+      - name: Restore _build
+        uses: actions/cache@v3
+        with:
+          path: _build
+          key: _build-cache-for-os-${{matrix.os}}-otp-${{matrix.otp}}-rebar3-${{matrix.rebar3}}-hash-${{hashFiles('rebar.lock')}}
+      - name: Restore rebar3's cache
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache/rebar3
+          key: rebar3-cache-for-os-${{matrix.os}}-otp-${{matrix.otp}}-rebar3-${{matrix.rebar3}}-hash-${{hashFiles('rebar.lock')}}
+      - name: Enable Developer Command Prompt
+        uses: ilammy/[email protected]
+        if: ${{ matrix.os == 'windows-2022' }}
+
+      - run: rebar3 as test get-deps
+      - run: rebar3 as test compile
+      - run: rebar3 as test ct
+
+      - run: rebar3 dialyzer
+        if: ${{ matrix.otp == '26.1' && matrix.os == 'ubuntu-22.04' }}
+      - run: rebar3 as test codecov analyze
+        if: ${{ matrix.otp == '26.1' && matrix.os == 'ubuntu-22.04' }}
+      - run: gcov -o c_src fast_pbkdf2
+        if: ${{ matrix.otp == '26.1' && matrix.os == 'ubuntu-22.04' }}
       - run: pip install --user codecov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '26.1' && matrix.os == 'ubuntu-22.04' }}
       - run: /home/runner/.local/bin/codecov
-        if: ${{ matrix.otp == '24.0' }}
+        if: ${{ matrix.otp == '26.1' && matrix.os == 'ubuntu-22.04' }}
diff --git a/Makefile b/Makefile
diff --git a/rebar.config b/rebar.config
@@ -12,11 +12,17 @@
       {proper, "1.4.0"}
     ]},
     {plugins, [
-      {rebar3_codecov, "0.3.0"}]},
+      {rebar3_codecov, "0.6.0"}]},
       {port_env,
         [
-          {"CFLAGS", "$CFLAGS -std=c99 -O3 -g -Wall -Wextra -fPIC -I/opt/homebrew/include -I/usr/local/include --coverage"},
-          {"LDLIBS", "$LDLIBS -lcrypto -L/opt/homebrew/lib/ -L/usr/local/lib --coverage"}
+          {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+              "CFLAGS", "$CFLAGS -std=c99 -O0 -g -Wall -Wextra -fPIC -I/opt/homebrew/include -I/usr/local/include --coverage"},
+          {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+              "$LDLIBS -lcrypto -L/opt/homebrew/lib/ -L/usr/local/lib --coverage"}
+          %% Flags for windows
+          {"win32", "CFLAGS", "$CFLAGS /O0 /DNDEBUG /Wall"},
+          {"win32", "LDLIBS", "$LDLIBS libcrypto.lib"},
+          {"DRV_LINK_TEMPLATE", "$DRV_LINK_TEMPLATE $LDLIBS"}
         ]
       }
   ]}
@@ -27,8 +33,11 @@
 
 {port_env,
   [
-    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)", "CFLAGS", "$CFLAGS -std=c99 -O3 -g -Wall -Wextra -fPIC -I/opt/homebrew/include -I/usr/local/include "},
-    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)", "LDLIBS", "$LDLIBS -lcrypto -L/opt/homebrew/lib/ -L/usr/local/lib"},
+    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+         "CFLAGS", "$CFLAGS -std=c99 -O3 -g -Wall -Wextra -fPIC -I/opt/homebrew/include -I/usr/local/include "},
+    {"(linux|solaris|freebsd|netbsd|openbsd|dragonfly|darwin|gnu)",
+         "LDLIBS", "$LDLIBS -lcrypto -L/opt/homebrew/lib/ -L/usr/local/lib"},
+    %% Flags for windows
     {"win32", "CFLAGS", "$CFLAGS /O2 /DNDEBUG /Wall"},
     {"win32", "LDLIBS", "$LDLIBS libcrypto.lib"},
     {"DRV_LINK_TEMPLATE", "$DRV_LINK_TEMPLATE $LDLIBS"}
@@ -37,14 +46,7 @@
 
 {port_specs,
   [
-    {
-      % Any arch
-      ".*",
-      % Create library
-      "priv/fast_pbkdf2.so",
-      % From files
-      ["c_src/*.c"]
-    }
+    {".*", "priv/fast_pbkdf2.so", ["c_src/*.c"]}
   ]}.
 
 {provider_hooks,