From eff0f4eda340f2ef4868145e55d331f5eac379cd Mon Sep 17 00:00:00 2001 From: Henrik Forsell Date: Wed, 26 Feb 2025 16:27:05 +0100 Subject: [PATCH 01/10] feat: Add optional sort option --- meta/mm_getdetails.sas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/mm_getdetails.sas b/meta/mm_getdetails.sas index a8ca9c4..d9341f9 100644 --- a/meta/mm_getdetails.sas +++ b/meta/mm_getdetails.sas @@ -17,6 +17,7 @@ %macro mm_getdetails(uri ,outattrs=work.attributes ,outassocs=work.associations + ,sortoptions= )/*/STORE SOURCE*/; data &outassocs; @@ -41,7 +42,7 @@ data &outassocs; n1+1; end; run; -proc sort; +proc sort &sortoptions; by assoc name; run; @@ -61,7 +62,7 @@ data &outattrs; n1+1; end; run; -proc sort; +proc sort &sortoptions; by type name; run; From 973071555889f5abe8e4ae8ca137be8a77bab134 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 15:27:50 +0000 Subject: [PATCH 02/10] chore: updating all.sas --- all.sas | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/all.sas b/all.sas index 5b19246..91dc2b3 100644 --- a/all.sas +++ b/all.sas @@ -17702,6 +17702,7 @@ run; %macro mm_getdetails(uri ,outattrs=work.attributes ,outassocs=work.associations + ,sortoptions= )/*/STORE SOURCE*/; data &outassocs; @@ -17726,7 +17727,7 @@ data &outassocs; n1+1; end; run; -proc sort; +proc sort &sortoptions; by assoc name; run; @@ -17746,7 +17747,7 @@ data &outattrs; n1+1; end; run; -proc sort; +proc sort &sortoptions; by type name; run; From 86606c6f18f0d3689e5073a192a007b2a438757b Mon Sep 17 00:00:00 2001 From: Allan Bowe <4420615+allanbowe@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:47:39 +0000 Subject: [PATCH 03/10] chore(docs): description of new param in mm_getdetails --- meta/mm_getdetails.sas | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/meta/mm_getdetails.sas b/meta/mm_getdetails.sas index d9341f9..fb729ee 100644 --- a/meta/mm_getdetails.sas +++ b/meta/mm_getdetails.sas @@ -1,17 +1,14 @@ /** @file mm_getdetails.sas @brief extracts metadata attributes and associations for a particular uri - @param [in] uri the metadata object for which to return attributes / associations + @param [in] sortoptions Enables sorting of the output datasets, for example, + `SORTSEQ=LINGUISTIC` @param [out] outattrs= (work.attributes) The dataset to create that contains the list of attributes @param [out] outassocs= (work.associations) The dataset to contain the list of associations - - @version 9.2 - @author Allan Bowe - **/ %macro mm_getdetails(uri From c7d46416cee722dd0db03bbcf9bf69834796885c Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 15:48:32 +0000 Subject: [PATCH 04/10] chore: updating all.sas --- all.sas | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/all.sas b/all.sas index 91dc2b3..d3ee592 100644 --- a/all.sas +++ b/all.sas @@ -17686,17 +17686,14 @@ run; %mend mm_getcols;/** @file mm_getdetails.sas @brief extracts metadata attributes and associations for a particular uri - @param [in] uri the metadata object for which to return attributes / associations + @param [in] sortoptions Enables sorting of the output datasets, for example, + `SORTSEQ=LINGUISTIC` @param [out] outattrs= (work.attributes) The dataset to create that contains the list of attributes @param [out] outassocs= (work.associations) The dataset to contain the list of associations - - @version 9.2 - @author Allan Bowe - **/ %macro mm_getdetails(uri From c6d9e6fdb257d48f544e8cff010903aba391c43b Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Wed, 26 Feb 2025 16:56:31 +0100 Subject: [PATCH 05/10] ci: vpn fix --- .github/workflows/run-tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 2bd6ba5..89339f4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -8,7 +8,7 @@ on: jobs: test: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 strategy: matrix: @@ -42,8 +42,13 @@ jobs: sudo wget -O /etc/apt/sources.list.d/openvpn3.list https://swupdate.openvpn.net/community/openvpn3/repos/openvpn3-jammy.list sudo apt update sudo apt install openvpn3=17~betaUb22042+jammy + - name: Start Open VPN 3 run: openvpn3 session-start --config .github/vpn/config.ovpn + + - name: Fetch SASJS server + run: curl ${{ secrets.SASJS_SERVER_URL }}/SASjsApi/info + - name: Install Doxygen run: sudo apt-get install doxygen From 608dbd1085ffed15818c029206391eb18e7c1a55 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 15:57:05 +0000 Subject: [PATCH 06/10] chore: updating all.sas From c363cfe4584b41a6adb738e28c46c1c71bcf849c Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Wed, 26 Feb 2025 16:59:00 +0100 Subject: [PATCH 07/10] ci: vpn fix --- .github/vpn/config.ovpn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/vpn/config.ovpn b/.github/vpn/config.ovpn index 85139b0..cba9653 100644 --- a/.github/vpn/config.ovpn +++ b/.github/vpn/config.ovpn @@ -3,10 +3,12 @@ client tls-client dev tun # this will connect with whatever proto DNS tells us (https://community.openvpn.net/openvpn/ticket/934) -proto tcp -remote vpn.4gl.io 7494 +proto udp +remote vpn.4gl.io 7194 resolv-retry infinite -cipher AES-256-CBC +# this will fallback from udp6 to udp4 as well +connect-timeout 5 +data-ciphers AES-256-CBC:AES-256-GCM auth SHA256 script-security 2 keepalive 10 120 From 2ad8f0b44bb0ad2495d770363bbe14ae42676bf5 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 16:00:40 +0000 Subject: [PATCH 08/10] chore: updating all.sas From e848690984ccf07ae263a23921616a5dec26e4df Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Wed, 26 Feb 2025 17:02:28 +0100 Subject: [PATCH 09/10] ci: vpn fix --- .github/workflows/run-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 89339f4..daab167 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -34,6 +34,10 @@ jobs: USER_KEY: ${{ secrets.USER_KEY }} TLS_KEY: ${{ secrets.TLS_KEY }} + - name: Chmod VPN files + run: | + chmod 600 .github/vpn/ca.crt .github/vpn/user.crt .github/vpn/user.key .github/vpn/tls.key + - name: Install Open VPN run: | sudo apt install apt-transport-https From a9ae874a458d682ebd805a38b02a4fbfefa16ca9 Mon Sep 17 00:00:00 2001 From: github-actions Date: Wed, 26 Feb 2025 16:03:24 +0000 Subject: [PATCH 10/10] chore: updating all.sas