From f2831609422dbf4d35d5f6a88635e2ef7feae081 Mon Sep 17 00:00:00 2001 From: Jens L Date: Sun, 19 Nov 2023 00:33:37 +0100 Subject: [PATCH] root: specify node and python versions in respective config files, deduplicate in CI (#7620) * root: specify node and python versions in respective config files, deduplicate in CI Signed-off-by: Jens Langhammer * fix engines missing for wdio Signed-off-by: Jens Langhammer * bump setup python version Signed-off-by: Jens Langhammer * actually don't bump a bunch of things Signed-off-by: Jens Langhammer --------- Signed-off-by: Jens Langhammer --- .github/actions/setup/action.yml | 16 ++++++++++------ .github/workflows/ci-outpost.yml | 2 +- .github/workflows/ci-web.yml | 10 +++++----- .github/workflows/ci-website.yml | 6 +++--- .github/workflows/release-publish.yml | 2 +- .github/workflows/web-api-publish.yml | 2 +- poetry.lock | 9 +++------ pyproject.toml | 6 +++--- tests/wdio/package.json | 3 +++ web/package-lock.json | 3 +++ web/package.json | 3 +++ website/package.json | 3 +++ 12 files changed, 39 insertions(+), 26 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index c13282ba0..a52a79bf7 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -9,23 +9,27 @@ inputs: runs: using: "composite" steps: - - name: Install poetry + - name: Install poetry & deps shell: bash run: | pipx install poetry || true - sudo apt update - sudo apt install -y libpq-dev openssl libxmlsec1-dev pkg-config gettext + sudo apt-get update + sudo apt-get install --no-install-recommends -y libpq-dev openssl libxmlsec1-dev pkg-config gettext - name: Setup python and restore poetry - uses: actions/setup-python@v3 + uses: actions/setup-python@v4 with: - python-version: "3.11" + python-version-file: 'pyproject.toml' cache: "poetry" - name: Setup node uses: actions/setup-node@v3 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json + - name: Setup go + uses: actions/setup-go@v4 + with: + go-version-file: "go.mod" - name: Setup dependencies shell: bash run: | diff --git a/.github/workflows/ci-outpost.yml b/.github/workflows/ci-outpost.yml index ba0447798..3514efe09 100644 --- a/.github/workflows/ci-outpost.yml +++ b/.github/workflows/ci-outpost.yml @@ -130,7 +130,7 @@ jobs: go-version-file: "go.mod" - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json - name: Generate API diff --git a/.github/workflows/ci-web.yml b/.github/workflows/ci-web.yml index fd1e36182..43ca0a168 100644 --- a/.github/workflows/ci-web.yml +++ b/.github/workflows/ci-web.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: ${{ matrix.project }}/package.json cache: "npm" cache-dependency-path: ${{ matrix.project }}/package-lock.json - working-directory: ${{ matrix.project }}/ @@ -40,7 +40,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -62,7 +62,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: ${{ matrix.project }}/package.json cache: "npm" cache-dependency-path: ${{ matrix.project }}/package-lock.json - working-directory: ${{ matrix.project }}/ @@ -78,7 +78,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ @@ -110,7 +110,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json - working-directory: web/ diff --git a/.github/workflows/ci-website.yml b/.github/workflows/ci-website.yml index 2a52c7c2e..78a3a8f8a 100644 --- a/.github/workflows/ci-website.yml +++ b/.github/workflows/ci-website.yml @@ -18,7 +18,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: website/package.json cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ @@ -32,7 +32,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: website/package.json cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ @@ -53,7 +53,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: website/package.json cache: "npm" cache-dependency-path: website/package-lock.json - working-directory: website/ diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index fe6233740..4d75af0d8 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -131,7 +131,7 @@ jobs: go-version-file: "go.mod" - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json cache: "npm" cache-dependency-path: web/package-lock.json - name: Build web diff --git a/.github/workflows/web-api-publish.yml b/.github/workflows/web-api-publish.yml index a6dfaeaa9..4c617a199 100644 --- a/.github/workflows/web-api-publish.yml +++ b/.github/workflows/web-api-publish.yml @@ -19,7 +19,7 @@ jobs: token: ${{ steps.generate_token.outputs.token }} - uses: actions/setup-node@v4 with: - node-version: "20" + node-version-file: web/package.json registry-url: "https://registry.npmjs.org" - name: Generate API Client run: make gen-client-ts diff --git a/poetry.lock b/poetry.lock index f9ced662d..8f132fb53 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2829,10 +2829,7 @@ files = [ [package.dependencies] astroid = ">=3.0.1,<=3.1.0-dev0" colorama = {version = ">=0.4.5", markers = "sys_platform == \"win32\""} -dill = [ - {version = ">=0.3.7", markers = "python_version >= \"3.12\""}, - {version = ">=0.3.6", markers = "python_version >= \"3.11\" and python_version < \"3.12\""}, -] +dill = {version = ">=0.3.6", markers = "python_version >= \"3.11\""} isort = ">=4.2.5,<6" mccabe = ">=0.6,<0.8" platformdirs = ">=2.2.0" @@ -4306,5 +4303,5 @@ files = [ [metadata] lock-version = "2.0" -python-versions = "^3.11" -content-hash = "9cb60a5e73aa1da7d95e319fa666aac06715ba44f6bcb3ab07d0a3b12aa23c84" +python-versions = "~3.11" +content-hash = "f64a4f4c392d2f40ec97276254d470d3e3768f5d1a975bf807e30c7ffcbcc79a" diff --git a/pyproject.toml b/pyproject.toml index ee641196c..139c447aa 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -151,10 +151,10 @@ packaging = "*" paramiko = "*" psycopg = { extras = ["c"], version = "*" } pycryptodome = "*" -pydantic = "<3.0.0" -pydantic-scim = "^0.0.8" +pydantic = "*" +pydantic-scim = "*" pyjwt = "*" -python = "^3.11" +python = "~3.11" pyyaml = "*" requests-oauthlib = "*" sentry-sdk = "*" diff --git a/tests/wdio/package.json b/tests/wdio/package.json index cd5745130..7a08d5be1 100644 --- a/tests/wdio/package.json +++ b/tests/wdio/package.json @@ -27,5 +27,8 @@ "precommit": "run-s lint:precommit lint:spelling prettier", "prettier-check": "prettier --check .", "prettier": "prettier --write ." + }, + "engines": { + "node": ">=20" } } diff --git a/web/package-lock.json b/web/package-lock.json index cf66b32d1..7d82b1c39 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -100,6 +100,9 @@ "typescript": "^5.2.2", "vite-tsconfig-paths": "^4.2.1" }, + "engines": { + "node": ">=20" + }, "optionalDependencies": { "@esbuild/darwin-arm64": "^0.19.5", "@esbuild/linux-amd64": "^0.18.11", diff --git a/web/package.json b/web/package.json index 6df43e20b..83b9b12aa 100644 --- a/web/package.json +++ b/web/package.json @@ -125,5 +125,8 @@ "@esbuild/darwin-arm64": "^0.19.5", "@esbuild/linux-amd64": "^0.18.11", "@esbuild/linux-arm64": "^0.19.5" + }, + "engines": { + "node": ">=20" } } diff --git a/website/package.json b/website/package.json index f76a48bca..c9f1b0c2a 100644 --- a/website/package.json +++ b/website/package.json @@ -55,5 +55,8 @@ "@types/react": "^18.2.37", "prettier": "3.1.0", "typescript": "~5.2.2" + }, + "engines": { + "node": ">=20" } }