diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index 5e17d219992..e0d2bfbbbc4 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -12,6 +12,8 @@ on: permissions: contents: read +env: + GNPM_VERSION: 0.1.0 jobs: withoutpluginsLinux: @@ -40,14 +42,14 @@ jobs: ${{ env.PNPM_HOME }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install libreoffice uses: awalsh128/cache-apt-pkgs-action@v1.6.0 @@ -96,14 +98,14 @@ jobs: ${{ env.PNPM_HOME }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install libreoffice uses: awalsh128/cache-apt-pkgs-action@v1.6.0 @@ -171,7 +173,7 @@ jobs: - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile --runtimeVersion="${{ matrix.node }}" @@ -224,7 +226,7 @@ jobs: - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install dependencies run: gnpm install --runtimeVersion="${{ matrix.node }}" - name: Build admin ui diff --git a/.github/workflows/build-and-deploy-docs.yml b/.github/workflows/build-and-deploy-docs.yml index 8ff8435ae8c..947e47059ac 100644 --- a/.github/workflows/build-and-deploy-docs.yml +++ b/.github/workflows/build-and-deploy-docs.yml @@ -23,6 +23,9 @@ concurrency: group: "pages" cancel-in-progress: false +env: + GNPM_VERSION: 0.1.0 + jobs: # Single deploy job since we're just deploying deploy: @@ -41,14 +44,14 @@ jobs: ${{ env.STORE_PATH }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Setup Pages uses: actions/configure-pages@v5 - name: Install dependencies diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 743a9aa4295..fc2fa1eea14 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,9 +12,11 @@ on: - 'v?[0-9]+.[0-9]+.[0-9]+' env: TEST_TAG: etherpad/etherpad:test + GNPM_VERSION: 0.1.0 permissions: contents: read + jobs: docker: runs-on: ubuntu-latest @@ -52,14 +54,14 @@ jobs: ${{ env.PNPM_HOME }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Test working-directory: etherpad diff --git a/.github/workflows/frontend-admin-tests.yml b/.github/workflows/frontend-admin-tests.yml index e65c8600c73..6410115e19b 100644 --- a/.github/workflows/frontend-admin-tests.yml +++ b/.github/workflows/frontend-admin-tests.yml @@ -9,6 +9,10 @@ on: permissions: contents: read # to fetch code (actions/checkout) + +env: + GNPM_VERSION: 0.1.0 + jobs: withplugins: env: @@ -39,14 +43,14 @@ jobs: ${{ env.PNPM_HOME }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Cache playwright binaries uses: actions/cache@v4 id: playwright-cache diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index eec808de891..5588290add2 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -9,6 +9,9 @@ on: permissions: contents: read # to fetch code (actions/checkout) +env: + GNPM_VERSION: 0.1.0 + jobs: playwright-chrome: env: @@ -34,14 +37,14 @@ jobs: ~/.cache/ms-playwright ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile @@ -97,14 +100,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile - name: export GIT_HASH to env @@ -159,13 +162,13 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile diff --git a/.github/workflows/handleRelease.yml b/.github/workflows/handleRelease.yml index bc162819e2b..ae0ba4892da 100644 --- a/.github/workflows/handleRelease.yml +++ b/.github/workflows/handleRelease.yml @@ -13,6 +13,7 @@ permissions: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: create-release: @@ -37,14 +38,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile - name: Build etherpad diff --git a/.github/workflows/load-test.yml b/.github/workflows/load-test.yml index 67101f3e1fd..4307f4026a5 100644 --- a/.github/workflows/load-test.yml +++ b/.github/workflows/load-test.yml @@ -15,6 +15,7 @@ permissions: env: PNPM_HOME: ~/.pnpm-store LOG_LEVEL: DEBUG + GNPM_VERSION: 0.1.0 jobs: withoutplugins: @@ -38,14 +39,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile @@ -81,14 +82,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install etherpad-load-test run: sudo npm install -g etherpad-load-test-socket-io @@ -149,14 +150,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile diff --git a/.github/workflows/perform-type-check.yml b/.github/workflows/perform-type-check.yml index 368e0eda66f..5cfe0e2011d 100644 --- a/.github/workflows/perform-type-check.yml +++ b/.github/workflows/perform-type-check.yml @@ -14,6 +14,7 @@ permissions: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: performTypeCheck: @@ -34,14 +35,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install all dependencies and symlink for ep_etherpad-lite run: gnpm install --frozen-lockfile diff --git a/.github/workflows/rate-limit.yml b/.github/workflows/rate-limit.yml index 31f232ec7e0..f2d48a9c7bc 100644 --- a/.github/workflows/rate-limit.yml +++ b/.github/workflows/rate-limit.yml @@ -14,6 +14,7 @@ permissions: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: ratelimit: @@ -37,14 +38,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: docker network diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8b011aafc9a..175baa6b93f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,6 +16,7 @@ on: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: releases: @@ -56,14 +57,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install dependencies ether.github.com run: gnpm install --frozen-lockfile working-directory: ether.github.com diff --git a/.github/workflows/releaseEtherpad.yml b/.github/workflows/releaseEtherpad.yml index 88857a28706..831cf574c14 100644 --- a/.github/workflows/releaseEtherpad.yml +++ b/.github/workflows/releaseEtherpad.yml @@ -6,6 +6,7 @@ on: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: release: @@ -25,14 +26,14 @@ jobs: ${{ env.STORE_PATH }} ~/.local/share/gnpm /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install dependencies run: gnpm install --frozen-lockfile - name: Rename etherpad diff --git a/.github/workflows/upgrade-from-latest-release.yml b/.github/workflows/upgrade-from-latest-release.yml index ad47fd1bdf4..d8ed532cd8c 100644 --- a/.github/workflows/upgrade-from-latest-release.yml +++ b/.github/workflows/upgrade-from-latest-release.yml @@ -14,6 +14,7 @@ permissions: env: PNPM_HOME: ~/.pnpm-store + GNPM_VERSION: 0.1.0 jobs: withpluginsLinux: @@ -43,14 +44,14 @@ jobs: ~/.local/share/gnpm ~/.cache/ms-playwright /usr/local/bin/gnpm - /usr/local/bin/gnpm-0.0.12 + /usr/local/bin/gnpm-${{ env.GNPM_VERSION }} key: ${{ runner.os }}-gnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }} restore-keys: | ${{ runner.os }}-gnpm-store- - name: Setup gnpm uses: SamTV12345/gnpm-setup@main with: - version: 0.0.12 + version: ${{ env.GNPM_VERSION }} - name: Install libreoffice uses: awalsh128/cache-apt-pkgs-action@v1.6.0 with: diff --git a/Dockerfile b/Dockerfile index 1b0a45d1a88..4391a3d7ea8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,9 +4,10 @@ # # Author: muxator ARG BUILD_ENV=git +ARG PNPM_VERSION=10.18.3 FROM node:lts-alpine AS adminbuild -RUN npm install -g pnpm@latest +RUN npm install -g pnpm@$PNPM_VERSION WORKDIR /opt/etherpad-lite COPY . . RUN pnpm install @@ -100,7 +101,7 @@ RUN mkdir -p "${EP_DIR}" && chown etherpad:etherpad "${EP_DIR}" # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=863199 RUN \ mkdir -p /usr/share/man/man1 && \ - npm install pnpm@latest -g && \ + npm install pnpm@$PNPM_VERSION -g && \ apk update && apk upgrade && \ apk add --no-cache \ ca-certificates \ diff --git a/package.json b/package.json index 5f070f488de..a895072d320 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "type": "git", "url": "https://github.com/ether/etherpad-lite.git" }, - "packageManager": "pnpm@10.18.0", + "packageManager": "pnpm@10.18.3", "engineStrict": true, "version": "2.5.1", "license": "Apache-2.0"