From 29dc651499bf8caccb329be85745d3a962625914 Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Tue, 15 Oct 2024 15:02:47 +0000 Subject: [PATCH 1/3] pr-checks: install python because with ubuntu 24, python 12 blows up on pip install, so it's either that or --break-system-packages --- .github/workflows/pr-checks.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index e4f26ae675..f1cf4d74a8 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -19,6 +19,11 @@ jobs: node-version: '18' cache: 'npm' + - name: "Install python 3.11" + uses: actions/setup-python@v5 + with: + python-version: '3.11' + - name: "Checks" run: | # fail if npm install had to change package-lock.json From a919ac336b6ed08153892b89a10b1512f76454fc Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Tue, 15 Oct 2024 15:20:50 +0000 Subject: [PATCH 2/3] remove community test remnant - breaks ci check --- test/cypress/e2e/community/feature-flags.js | 22 --------------------- 1 file changed, 22 deletions(-) delete mode 100644 test/cypress/e2e/community/feature-flags.js diff --git a/test/cypress/e2e/community/feature-flags.js b/test/cypress/e2e/community/feature-flags.js deleted file mode 100644 index 418652b3f9..0000000000 --- a/test/cypress/e2e/community/feature-flags.js +++ /dev/null @@ -1,22 +0,0 @@ -const apiPrefix = Cypress.env('apiPrefix'); - -describe('Feature flags', () => { - it('match expectations', () => { - cy.request(`${apiPrefix}_ui/v1/feature-flags/`).then(({ body }) => { - expect(body._messages).to.be.empty; - expect(body).to.include({ ai_deny_index: true }); - expect(body).to.include({ can_create_signatures: false }); - expect(body).to.include({ can_upload_signatures: false }); - expect(body).to.include({ collection_auto_sign: false }); - expect(body).to.include({ collection_signing: false }); - expect(body).to.include({ container_signing: false }); - expect(body).to.include({ display_repositories: false }); - expect(body).to.include({ display_signatures: false }); - expect(body).to.include({ execution_environments: false }); - expect(body).to.include({ external_authentication: true }); - expect(body).to.include({ legacy_roles: true }); - expect(body).to.include({ require_upload_signatures: false }); - expect(body).to.include({ signatures_enabled: false }); - }); - }); -}); From 67a2d9d2207de6cda38f766f9ff3f71418225fdb Mon Sep 17 00:00:00 2001 From: Martin Hradil Date: Mon, 10 Jun 2024 19:14:13 +0000 Subject: [PATCH 3/3] Bump node to v20 --- .github/workflows/automerge.yml | 4 ++-- .github/workflows/cypress.yml | 4 ++-- .github/workflows/pr-checks.yml | 8 ++++---- .github/workflows/stable-release.yml | 4 ++-- Dockerfile | 2 +- package-lock.json | 4 ++-- package.json | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/automerge.yml b/.github/workflows/automerge.yml index a0e0e806c1..545b7c3e1c 100644 --- a/.github/workflows/automerge.yml +++ b/.github/workflows/automerge.yml @@ -13,10 +13,10 @@ jobs: - name: "Checkout ansible-hub-ui (${{ github.ref }})" uses: actions/checkout@v4 - - name: "Install node 18" + - name: "Install node 20" uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: "Check automerge conditions" working-directory: ".github/workflows" diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 512c5f935c..cd71de1a84 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -99,10 +99,10 @@ jobs: working-directory: 'oci_env' run: 'oci-env compose up &' - - name: "Install node 18" + - name: "Install node 20" uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: "Cache ~/.npm & ~/.cache/Cypress" uses: actions/cache@v4 diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml index f1cf4d74a8..eca1b5e545 100644 --- a/.github/workflows/pr-checks.yml +++ b/.github/workflows/pr-checks.yml @@ -13,10 +13,10 @@ jobs: - name: "Checkout ansible-hub-ui (${{ github.ref }})" uses: actions/checkout@v4 - - name: "Install node 18" + - name: "Install node 20" uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' cache: 'npm' - name: "Install python 3.11" @@ -93,10 +93,10 @@ jobs: with: path: 'pr' - - name: "Install node 18" + - name: "Install node 20" uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' cache: 'npm' cache-dependency-path: | base/package-lock.json diff --git a/.github/workflows/stable-release.yml b/.github/workflows/stable-release.yml index 6ba677985e..71334d0d97 100644 --- a/.github/workflows/stable-release.yml +++ b/.github/workflows/stable-release.yml @@ -29,10 +29,10 @@ jobs: RELEASE_TAG=`sed 's/^refs\/tags\///' <<< $GITHUB_REF` echo "RELEASE_TAG=${RELEASE_TAG}" >> $GITHUB_ENV - - name: "Install node 18" + - name: "Install node 20" uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '20' - name: "Cache ~/.npm" uses: actions/cache@v4 diff --git a/Dockerfile b/Dockerfile index 88eb1649fc..56c90db2ce 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # WARNING # This Dockerfile is intended for development purposes only. Do not use it for production deployments -FROM node:18-alpine +FROM node:20-alpine WORKDIR /hub/ RUN mkdir -p /hub/app/ && \ diff --git a/package-lock.json b/package-lock.json index 9028781ffb..26ff3c8f3b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -72,8 +72,8 @@ "webpack-dev-server": "^5.1.0" }, "engines": { - "node": ">=18", - "npm": ">=9" + "node": ">=20", + "npm": ">=10" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/package.json b/package.json index 4a9e8c86f4..d8bb93dffc 100644 --- a/package.json +++ b/package.json @@ -94,7 +94,7 @@ "start-standalone": "NODE_ENV=development webpack serve --host 0.0.0.0 --config config/standalone.dev.webpack.config.js" }, "engines": { - "node": ">=18", - "npm": ">=9" + "node": ">=20", + "npm": ">=10" } }