Merge pull request #20 from rabbitmq/lukebakken/gha-updates

Update actions to include Windows and latest Erlang

Author: michaelklishin

.github/workflows/erlang.yml

@@ -1,34 +1,24 @@
-name: Test
+name: credentials-obfuscation
 on: push
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ${{ matrix.os }}
     strategy:
-      fail-fast: false
       matrix:
-        otp:
-        - "23.3"
-        - "24.3"
+        otp_version: [23, 24, 25]
+        os: [ubuntu-latest, windows-latest]
     steps:
-    - name: CHECKOUT
-      uses: actions/checkout@v2
-    - name: CONFIGURE ERLANG
-      uses: erlef/setup-beam@v1
+    - uses: actions/checkout@v3
+    - uses: erlef/setup-beam@v1
       with:
-        otp-version: ${{ matrix.otp }}
-    - name: Deps
-      run: rebar3 get-deps
-    - name: Compile
-      run: rebar3 compile
-    - name: Dialyze
-      run: rebar3 dialyzer
-    - name: EUnit
-      run: rebar3 eunit
-    - name: Common Test
-      run: rebar3 ct
-    - name: Capture Test Logs on Failure
-      uses: actions/upload-artifact@v2-preview
+        otp-version: ${{ matrix.otp_version }}
+        rebar3-version: '3'
+    - run: rebar3 compile
+    - run: rebar3 dialyzer
+    - run: rebar3 eunit
+    - run: rebar3 ct --verbose --verbosity=3 --readable=true
+    - uses: actions/upload-artifact@v3
       if: failure()
       with:
-        name: ct-logs-${{matrix.otp}}
-        path: logs/*
+        name: ct-logs-${{matrix.os}}-${{matrix.otp_version}}
+        path: _build/test/logs

.gitignore

@@ -1,4 +1,5 @@
 .rebar3
+rebar3.crashdump
 _*
 .eunit
 *.o

test/credentials_obfuscation_SUITE.erl

@@ -11,19 +11,29 @@
 
 -compile(export_all).
 
-all() -> [encrypt_decrypt,
-          encrypt_decrypt_char_list_value,
-          encrypt_decrypt_invalid_char_list_value,
-          use_predefined_secret,
-          use_cookie_as_secret,
-          change_of_secret_returns_passed_in_data,
-          fallback_secret,
-          encryption_happens_only_when_secret_available,
-          change_default_cipher,
-          disabled,
-          refresh_configuration,
-          refresh_configuration_invalid_cipher,
-          application_failure_for_invalid_cipher].
+all() ->
+    AllTests = [encrypt_decrypt,
+                encrypt_decrypt_char_list_value,
+                encrypt_decrypt_invalid_char_list_value,
+                use_predefined_secret,
+                use_cookie_as_secret,
+                change_of_secret_returns_passed_in_data,
+                fallback_secret,
+                encryption_happens_only_when_secret_available,
+                change_default_cipher,
+                disabled,
+                refresh_configuration,
+                refresh_configuration_invalid_cipher,
+                application_failure_for_invalid_cipher],
+    case {os:getenv("GITHUB_ACTIONS"), os:type()} of
+        {false, _} ->
+            AllTests;
+        {_, {win32, _}} ->
+            ct:pal("skipping some tests on GitHub actions on Windows"),
+            Tests0 = lists:delete(use_cookie_as_secret, AllTests),
+            Tests1 = lists:delete(encryption_happens_only_when_secret_available, Tests0),
+            Tests1
+    end.
 
 init_per_testcase(disabled, Config) ->
     ok = application:set_env(credentials_obfuscation, enabled, false),
@@ -122,8 +132,7 @@ use_cookie_as_secret(_Config) ->
     CookieBin = atom_to_binary(Cookie, utf8),
     ok = credentials_obfuscation:set_secret(CookieBin),
     ?assertEqual(CookieBin, credentials_obfuscation:secret()),
-    ok = net_kernel:stop(),
-    ok.
+    ok = net_kernel:stop().
 
 %% change of secret should not crash the credentials_obfuscation_svc process
 change_of_secret_returns_passed_in_data(_Config) ->
@@ -190,8 +199,7 @@ encryption_happens_only_when_secret_available(_Config) ->
     {encrypted, _} = EncryptedUri,
     ?assertEqual(Uri, credentials_obfuscation:decrypt(EncryptedUri)),
 
-    ok = net_kernel:stop(),
-    ok.
+    ok = net_kernel:stop().
 
 change_default_cipher(_Config) ->
     ?assertNotEqual(credentials_obfuscation_pbe:default_cipher(), credentials_obfuscation:cipher()),