From ca6319f06d74415ae55e5cefa047e1b581286f90 Mon Sep 17 00:00:00 2001 From: Johannes Marbach Date: Fri, 2 Oct 2026 13:05:12 +0200 Subject: [PATCH] Remove layered boolean --- .github/workflows/build-element-call.yaml | 10 ---------- .github/workflows/build.yaml | 3 --- .github/workflows/lint.yaml | 2 +- .github/workflows/test.yaml | 9 --------- scripts/layered.sh | 7 +++++-- 5 files changed, 6 insertions(+), 25 deletions(-) diff --git a/.github/workflows/build-element-call.yaml b/.github/workflows/build-element-call.yaml index 2eeb8b577..b35948d75 100644 --- a/.github/workflows/build-element-call.yaml +++ b/.github/workflows/build-element-call.yaml @@ -14,11 +14,6 @@ on: description: The build mode for vite. Must be either 'development' or 'production' required: false default: production - layered: - type: boolean - description: Build against the matching branch of matrix-js-sdk (if any) instead of the locked commit. - required: false - default: false secrets: SENTRY_ORG: required: true @@ -48,11 +43,6 @@ jobs: cache: "pnpm" node-version-file: ".node-version" - name: Install dependencies - if: ${{ !inputs.layered }} - # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) - run: "pnpm install --frozen-lockfile --ignore-pnpmfile" - - name: Install dependencies (layered) - if: ${{ inputs.layered }} # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) run: "scripts/layered.sh --ignore-pnpmfile" env: diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index aa14a3dff..3fe10723d 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,7 +15,6 @@ jobs: package: full vite_app_version: ${{ github.event.release.tag_name || github.sha }} build_mode: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'development build') && 'development' || 'production' }} - layered: ${{ github.event_name == 'pull_request' }} secrets: SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} @@ -66,7 +65,6 @@ jobs: package: embedded vite_app_version: ${{ github.event.release.tag_name || github.sha }} build_mode: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'development build') && 'development' || 'production' }} - layered: ${{ github.event_name == 'pull_request' }} secrets: SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} @@ -81,7 +79,6 @@ jobs: package: sdk vite_app_version: ${{ github.event.release.tag_name || github.sha }} build_mode: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'development build') && 'development' || 'production' }} - layered: ${{ github.event_name == 'pull_request' }} secrets: SENTRY_ORG: ${{ secrets.SENTRY_ORG }} SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml index 89d0baf62..c2ba3b394 100644 --- a/.github/workflows/lint.yaml +++ b/.github/workflows/lint.yaml @@ -17,7 +17,7 @@ jobs: with: cache: "pnpm" node-version-file: ".node-version" - - name: Install dependencies (layered) + - name: Install dependencies # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) run: "scripts/layered.sh --ignore-pnpmfile" env: diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 582e8ab2f..d29697e1d 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -20,11 +20,6 @@ jobs: cache: "pnpm" node-version-file: ".node-version" - name: Install dependencies - if: github.event_name != 'pull_request' - # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) - run: "pnpm install --frozen-lockfile --ignore-pnpmfile" - - name: Install dependencies (layered) - if: github.event_name == 'pull_request' # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) run: "scripts/layered.sh --ignore-pnpmfile" env: @@ -65,11 +60,7 @@ jobs: cache: "pnpm" node-version-file: ".node-version" - name: Install dependencies - if: github.event_name != 'pull_request' # ignore-pnpmfile should never be commited. Make CI crash if it happened (`pnpmfileChecksum` is present) - run: pnpm install --frozen-lockfile --ignore-pnpmfile - - name: Install dependencies (layered) - if: github.event_name == 'pull_request' run: scripts/layered.sh --ignore-pnpmfile env: PR_HEAD_REPO_OWNER: ${{ github.event.pull_request.head.repo.owner.login }} diff --git a/scripts/layered.sh b/scripts/layered.sh index 878d7dc84..54f38fa1f 100755 --- a/scripts/layered.sh +++ b/scripts/layered.sh @@ -3,11 +3,14 @@ # Installs dependencies, then swaps matrix-js-sdk for a branch of the same # name as the pull request branch under test if one exists. This is what # lets CI test an Element Call branch together with a matrix-js-sdk branch -# before either is merged. Without a matching branch the install is left as -# pnpm-lock.yaml pins it. Inspired by scripts/layered.sh in element-web. +# before either is merged. Inspired by scripts/layered.sh in element-web. # # Usage: scripts/layered.sh [pnpm install flags] # +# The layering is only performed when package.json uses the develop branch of +# matrix-js-sdk and the run is for a pull request whose branch has a matrix-js-sdk +# counterpart. Otherwise the dependency is left as pnpm-lock.yaml pins it. +# # The matrix-js-sdk checkout is nested inside this directory because some CI # systems do not allow moving above the primary checkout. It is git-ignored. #