From f4768bffd3dbb2fe243966572ba74002024d96e1 Mon Sep 17 00:00:00 2001 From: Allan Bowe <4420615+allanbowe@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:27:57 +0000 Subject: [PATCH 1/5] fix: extra bit of sleep for file recognition closes #381 --- api/src/controllers/internal/Session.ts | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index 751d306..2ba483b 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -260,9 +260,16 @@ data _null_; rc=filename(fname,getoption('SYSIN') ); if rc = 0 and fexist(fname) then rc=fdelete(fname); rc=filename(fname); - /* now wait for the real SYSIN */ - slept=0; - do until ( fileexist(getoption('SYSIN')) or slept>(60*15) ); + /* now wait for the real SYSIN (location of code.sas) */ + slept=0;fname=''; + do until (slept>(60*15) ); + rc=filename(fname,getoption('SYSIN') ); + if rc = 0 and fexist(fname) then do; + putlog fname=; + rc=filename(fname); + rc=sleep(0.01,1); /* wait just a little more */ + stop; + end; slept=slept+sleep(0.01,1); end; stop; From 3529232f1f7be9ef7a96e0eed5add02063d23ad2 Mon Sep 17 00:00:00 2001 From: Allan Bowe <4420615+allanbowe@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:29:02 +0000 Subject: [PATCH 2/5] chore: whitespace removal --- api/src/controllers/internal/Session.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/controllers/internal/Session.ts b/api/src/controllers/internal/Session.ts index 2ba483b..7cc2847 100644 --- a/api/src/controllers/internal/Session.ts +++ b/api/src/controllers/internal/Session.ts @@ -262,8 +262,8 @@ data _null_; rc=filename(fname); /* now wait for the real SYSIN (location of code.sas) */ slept=0;fname=''; - do until (slept>(60*15) ); - rc=filename(fname,getoption('SYSIN') ); + do until (slept>(60*15)); + rc=filename(fname,getoption('SYSIN')); if rc = 0 and fexist(fname) then do; putlog fname=; rc=filename(fname); From f5018ce1dfa0c1c8426d84b1e2c44e1660d61cf9 Mon Sep 17 00:00:00 2001 From: Allan Bowe <4420615+allanbowe@users.noreply.github.com> Date: Wed, 12 Mar 2025 17:33:02 +0000 Subject: [PATCH 3/5] chore: prettier fix --- web/src/index.css | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/src/index.css b/web/src/index.css index fe5d105..f3b1508 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -1,15 +1,15 @@ body { margin: 0; - font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', - 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', - sans-serif; + font-family: + -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', + 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; } code { - font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', - monospace; + font-family: + source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace; } .container { From af1a386b136d7213e33753e7f4b361f2d80dc851 Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Thu, 13 Mar 2025 15:43:20 +0500 Subject: [PATCH 4/5] chore(workflow): install openssl 1.1 in actions --- .github/workflows/build.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6f74e93..188eaf6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,6 +45,13 @@ jobs: working-directory: ./api run: npm ci + # Ubuntu 22.04+ have moved to OpenSSL 3, so the older version isn't installed by default. + # this is required for unit tests + - name: Install OpenSSL 1.1 + run: | + sudo apt update + sudo apt install -y libssl1.1 || sudo apt install -y libssl3 + - name: Run Unit Tests working-directory: ./api run: npm test From aca2fff4ac552e97bd18103dc666509496d1bf01 Mon Sep 17 00:00:00 2001 From: Sabir Hassan Date: Thu, 13 Mar 2025 15:50:23 +0500 Subject: [PATCH 5/5] chore(workflow): run the build workflow on ubuntu 20.04 --- .github/workflows/build.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 188eaf6..a588d1e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: jobs: lint: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: @@ -28,7 +28,7 @@ jobs: run: npm run lint-web build-api: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: @@ -45,13 +45,6 @@ jobs: working-directory: ./api run: npm ci - # Ubuntu 22.04+ have moved to OpenSSL 3, so the older version isn't installed by default. - # this is required for unit tests - - name: Install OpenSSL 1.1 - run: | - sudo apt update - sudo apt install -y libssl1.1 || sudo apt install -y libssl3 - - name: Run Unit Tests working-directory: ./api run: npm test @@ -73,7 +66,7 @@ jobs: CI: true build-web: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: