From e4c264c8ed51bbd4dd70e1efaeded5cb07a0fac9 Mon Sep 17 00:00:00 2001 From: nebay-abraha Date: Mon, 28 Sep 2026 09:27:46 +0100 Subject: [PATCH 1/4] Fix integration CI: seed rspace-web dev deployment.properties --- .github/workflows/codeql-and-tests.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/codeql-and-tests.yml b/.github/workflows/codeql-and-tests.yml index 09003fa..fdca7b0 100644 --- a/.github/workflows/codeql-and-tests.yml +++ b/.github/workflows/codeql-and-tests.yml @@ -167,6 +167,12 @@ jobs: rm -rf "$RS_FILE_BASE" mkdir -p "$RS_FILE_BASE" + - name: Seed dev deployment.properties + working-directory: rspace-web + run: | + cp -f src/main/resources/deployments/dev/deployment.properties.example \ + src/main/resources/deployments/dev/deployment.properties + # Backend only - no -DgenerateReactDist, so no Node/pnpm/Vite build. # The Python client only exercises the REST API, not the UI. - name: Build RSpace backend @@ -191,7 +197,9 @@ jobs: -Djdbc.db.maven=rspace \ -DRS_FILE_BASE="$RS_FILE_BASE" \ > /tmp/jetty.log 2>&1 & - for i in $(seq 1 180); do + # 168 x 5s = 14 min, under the 15 min step timeout, so the log tail + # below actually gets printed instead of the step being killed first. + for i in $(seq 1 168); do if [ "$(curl -s -o /dev/null -w '%{http_code}' http://localhost:8080/login || true)" = "200" ]; then echo "Ready after ~$((i*5))s" exit 0 From 2dc316ae4a007e256a3c0cad1a94475288ab2c5a Mon Sep 17 00:00:00 2001 From: nebay-abraha Date: Mon, 28 Sep 2026 09:51:54 +0100 Subject: [PATCH 2/4] Fix: changed both ci triggers from master to main --- .github/workflows/codeql-and-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/codeql-and-tests.yml b/.github/workflows/codeql-and-tests.yml index fdca7b0..3106321 100644 --- a/.github/workflows/codeql-and-tests.yml +++ b/.github/workflows/codeql-and-tests.yml @@ -2,9 +2,9 @@ name: codeQL and Test on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] workflow_dispatch: # allow manual trigger permissions: From 2b169d919dd2432c8874bed9c953a71133ac172c Mon Sep 17 00:00:00 2001 From: nebay-abraha Date: Mon, 28 Sep 2026 10:22:58 +0100 Subject: [PATCH 3/4] Fix: build rspace front and backend app --- .github/workflows/codeql-and-tests.yml | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/.github/workflows/codeql-and-tests.yml b/.github/workflows/codeql-and-tests.yml index 3106321..d474948 100644 --- a/.github/workflows/codeql-and-tests.yml +++ b/.github/workflows/codeql-and-tests.yml @@ -167,17 +167,24 @@ jobs: rm -rf "$RS_FILE_BASE" mkdir -p "$RS_FILE_BASE" + - name: Set up Node + uses: actions/setup-node@v4 + with: + node-version: 24 + + - name: Enable corepack + run: corepack enable + - name: Seed dev deployment.properties working-directory: rspace-web run: | cp -f src/main/resources/deployments/dev/deployment.properties.example \ src/main/resources/deployments/dev/deployment.properties - # Backend only - no -DgenerateReactDist, so no Node/pnpm/Vite build. - # The Python client only exercises the REST API, not the UI. - - name: Build RSpace backend + + - name: Build RSpace working-directory: rspace-web - run: ./mvnw clean package -DskipTests -Dtimestamp=${{ github.run_id }} -Djava-version=17 -Djava-vendor=temurin + run: ./mvnw clean package -DgenerateReactDist -DskipTests -Dtimestamp=${{ github.run_id }} -Djava-version=17 -Djava-vendor=temurin - name: Start RSpace and wait for readiness working-directory: rspace-web From ed30e9887ea8a5b4dfee29cf4b5cfd00561e0ae3 Mon Sep 17 00:00:00 2001 From: nebay-abraha Date: Mon, 28 Sep 2026 10:38:53 +0100 Subject: [PATCH 4/4] =?UTF-8?q?Fix:=20replace=20b.png=20with=20a=20valid?= =?UTF-8?q?=201=C3=971=20grayscale=20PNG=20(67=20bytes)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- rspace_client/tests/data/tree/subdir/b.png | Bin 0 -> 67 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/rspace_client/tests/data/tree/subdir/b.png b/rspace_client/tests/data/tree/subdir/b.png index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..aea7f5ff8ad3e3c7c084080bda8ac3b95e9a71cd 100644 GIT binary patch literal 67 zcmeAS@N?(olHy`uVBq!ia0vp^j3CSbBp9sfW`_bPE>9Q7kcv6U2|zXz1Ea_KC51p1 NgQu&X%Q~loCIDk>43q!> literal 0 HcmV?d00001