From 25ed2eb2f65bba9c84bdf27ea7afd6bf616949de Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 17:43:55 +0200 Subject: [PATCH 1/7] Auto deploy to CF --- .github/workflows/main.yml | 35 ++++++++++++++++++++++++++++++++++- package.json | 4 ++-- 2 files changed, 36 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3cf8df1..8437e82 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,9 +11,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: npm - name: Install NPM dependencies @@ -30,3 +33,33 @@ jobs: - name: Test run: npm run test:ci + + Deploy: + needs: [Build] + runs-on: ubuntu-latest + if: | + always() && + !contains(needs.*.result, 'cancelled') && + !contains(needs.*.result, 'failure') + # if: | + # always() && + # !contains(needs.*.result, 'cancelled') && + # !contains(needs.*.result, 'failure') && + # github.ref == 'refs/heads/main' + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-node@v4 + with: + node-version: 22 + cache: npm + + - name: Install CF CLI + run: | + wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg + echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list + apt-get update + apt-get install cf8-cli + cf --help diff --git a/package.json b/package.json index 76cadad..febf419 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,8 @@ "type": "module", "private": true, "engines": { - "node": ">=20.0.0", - "npm": ">=9.0.0" + "node": "^22", + "npm": "^9" }, "scripts": { "build": "rimraf dist && tsc", From 6dcefc014218de6867d3ce0f88838056f937899c Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 17:57:55 +0200 Subject: [PATCH 2/7] Use CF CLI official docker image --- .github/workflows/main.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 8437e82..96b446f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -46,6 +46,7 @@ jobs: # !contains(needs.*.result, 'cancelled') && # !contains(needs.*.result, 'failure') && # github.ref == 'refs/heads/main' + container: cloudfoundry/cli:latest steps: - uses: actions/checkout@v4 with: @@ -56,10 +57,6 @@ jobs: node-version: 22 cache: npm - - name: Install CF CLI + - name: Test CF run: | - wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg - echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list - apt-get update - apt-get install cf8-cli cf --help From c2acf49c6bbf95894799936571e0f65ebb5fa192 Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 18:02:14 +0200 Subject: [PATCH 3/7] Disable node install --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 96b446f..f483a02 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -52,10 +52,10 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-node@v4 - with: - node-version: 22 - cache: npm + # - uses: actions/setup-node@v4 + # with: + # node-version: 22 + # cache: npm - name: Test CF run: | From da4c2bd1c6f3051b94c35cf0e6f352090d889a34 Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 18:05:29 +0200 Subject: [PATCH 4/7] Print current directory --- .github/workflows/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f483a02..e5e65f0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,4 +59,6 @@ jobs: - name: Test CF run: | + pwd + ls -la cf --help From 2f095c4c8ec5f4778bf9cc8b6aaf28bc744ef370 Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 18:17:23 +0200 Subject: [PATCH 5/7] Transfer build artifacts --- .github/workflows/main.yml | 12 ++++++++++-- package-lock.json | 8 ++++---- package.json | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e5e65f0..30f46fb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,6 +34,13 @@ jobs: - name: Test run: npm run test:ci + - uses: actions/upload-artifact@v4 + with: + name: app-build + path: | + dist + /package*.json + Deploy: needs: [Build] runs-on: ubuntu-latest @@ -48,9 +55,10 @@ jobs: # github.ref == 'refs/heads/main' container: cloudfoundry/cli:latest steps: - - uses: actions/checkout@v4 + - name: Download pre-built app artifact + uses: actions/download-artifact@v4 with: - fetch-depth: 0 + name: app-build # - uses: actions/setup-node@v4 # with: diff --git a/package-lock.json b/package-lock.json index 4158aa8..1c84423 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "@open-resource-discovery/specification-reference-application", + "name": "@open-resource-discovery/reference-application", "version": "1.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "@open-resource-discovery/specification-reference-application", + "name": "@open-resource-discovery/reference-application", "version": "1.1.0", "dependencies": { "@fastify/basic-auth": "6.2.0", @@ -36,8 +36,8 @@ "typescript": "~5.8.3" }, "engines": { - "node": ">=20.0.0", - "npm": ">=9.0.0" + "node": "^22", + "npm": ">=9" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index febf419..df6812a 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "private": true, "engines": { "node": "^22", - "npm": "^9" + "npm": ">=9" }, "scripts": { "build": "rimraf dist && tsc", From 222a22e83706a4aa450e46aa36f130e175e68395 Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 18:18:58 +0200 Subject: [PATCH 6/7] Change artifact ID --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30f46fb..36a68bf 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,7 +36,7 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: app-build + name: app path: | dist /package*.json @@ -58,7 +58,7 @@ jobs: - name: Download pre-built app artifact uses: actions/download-artifact@v4 with: - name: app-build + name: app # - uses: actions/setup-node@v4 # with: From cb2ff40d32d21de358319e5d50fea9b87568cda6 Mon Sep 17 00:00:00 2001 From: Pavel Kornev Date: Mon, 7 Jul 2025 18:22:52 +0200 Subject: [PATCH 7/7] Fix upload artifacts list --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 36a68bf..a9f1a7a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -36,10 +36,10 @@ jobs: - uses: actions/upload-artifact@v4 with: - name: app + name: app-build path: | - dist - /package*.json + ./dist + ./package*.json Deploy: needs: [Build] @@ -58,7 +58,7 @@ jobs: - name: Download pre-built app artifact uses: actions/download-artifact@v4 with: - name: app + name: app-build # - uses: actions/setup-node@v4 # with: