diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..e42befb2e --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +vendor/*.zip filter=lfs diff=lfs merge=lfs -text +vendor/*.tar.gz filter=lfs diff=lfs merge=lfs -text diff --git a/.github/workflows/build-publish-docker.yml b/.github/workflows/build-publish-docker.yml index fce3b8191..6467ba13d 100644 --- a/.github/workflows/build-publish-docker.yml +++ b/.github/workflows/build-publish-docker.yml @@ -29,7 +29,7 @@ jobs: build_id: ${{ steps.set_build_id.outputs.build_id }} steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -50,7 +50,7 @@ jobs: openstad_version: ${{ steps.chart_version.outputs.openstad_version }} steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -69,7 +69,7 @@ jobs: pull-requests: read steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -95,8 +95,9 @@ jobs: pull-requests: read steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -105,7 +106,7 @@ jobs: node-version: 24 - name: Install dependencies - run: npm i + run: CYPRESS_INSTALL_BINARY=$GITHUB_WORKSPACE/vendor/cypress-15.6.0.zip npm ci --legacy-peer-deps - name: Run Vitest tests run: npm run test:unit @@ -120,8 +121,9 @@ jobs: contents: read steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -130,7 +132,7 @@ jobs: node-version: 24 - name: Install dependencies - run: npm ci --legacy-peer-deps + run: CYPRESS_INSTALL_BINARY=$GITHUB_WORKSPACE/vendor/cypress-15.6.0.zip npm ci --legacy-peer-deps - name: Run Cypress tests uses: cypress-io/github-action@v6 @@ -154,8 +156,9 @@ jobs: contents: read steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -203,8 +206,9 @@ jobs: BUILD_TARGET: release steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -283,8 +287,9 @@ jobs: contents: read steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false @@ -376,8 +381,9 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v4 + uses: actions/checkout@v5 with: + lfs: true ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.branch || github.ref }} persist-credentials: false diff --git a/Dockerfile b/Dockerfile index f03dda41e..60e088475 100755 --- a/Dockerfile +++ b/Dockerfile @@ -34,6 +34,7 @@ ENV BUILD_ENV=${BUILD_ENV} # set Cypress cache to a writable temp path (avoids issues with /root/.cache) ENV CYPRESS_CACHE_FOLDER=/tmp/CypressCache +ENV CYPRESS_INSTALL_BINARY=/opt/openstad-headless/vendor/cypress-15.6.0.zip RUN npm ci --legacy-peer-deps -ws diff --git a/package-lock.json b/package-lock.json index 9f56a589a..523924afc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21,7 +21,7 @@ }, "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "cypress": "^15.3.0", + "cypress": "^15.6.0", "mysql2": "^3.11.3", "prettier": "3.0.3", "vitest": "^3.2.3" diff --git a/package.json b/package.json index 433523874..ff213bc1e 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "private": true, "devDependencies": { "@trivago/prettier-plugin-sort-imports": "^4.3.0", - "cypress": "^15.3.0", + "cypress": "^15.6.0", "mysql2": "^3.11.3", "prettier": "3.0.3", "vitest": "^3.2.3" diff --git a/vendor/cypress-15.6.0.zip b/vendor/cypress-15.6.0.zip new file mode 100644 index 000000000..b040403f3 --- /dev/null +++ b/vendor/cypress-15.6.0.zip @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ceacb558b7e254434900ca4439fb45de8da0938185491f96ca4f99fa9aa1f2c +size 221256857 diff --git a/vendor/knox-0.9.3.tar.gz b/vendor/knox-0.9.3.tar.gz index 6358cdd29..156372ba5 100644 Binary files a/vendor/knox-0.9.3.tar.gz and b/vendor/knox-0.9.3.tar.gz differ