diff --git a/.github/mergify.yml b/.github/mergify.yml index 51f0a018a..292defc72 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,21 +1,21 @@ queue_rules: - name: default - conditions: + queue_conditions: - check-success=all - label=automerge - base=main - "#changes-requested-reviews-by=0" - "#approved-reviews-by>=1" - -pull_request_rules: - - name: automatic merge when CI passes on main - conditions: + merge_conditions: - check-success=all - label=automerge - base=main - "#changes-requested-reviews-by=0" - "#approved-reviews-by>=1" + merge_method: merge + +pull_request_rules: + - name: automatic merge when CI passes on main + conditions: [] actions: queue: - name: default - method: merge diff --git a/.github/workflows/k8s-cleaner.yml b/.github/workflows/k8s-cleaner.yml index 3e4e6d2cf..d39058e21 100644 --- a/.github/workflows/k8s-cleaner.yml +++ b/.github/workflows/k8s-cleaner.yml @@ -26,14 +26,14 @@ jobs: uses: actions/checkout@v4 - name: Setup gcloud CLI - uses: google-github-actions/setup-gcloud@v2.1.1 + uses: google-github-actions/setup-gcloud@v2.1.2 with: service_account_key: ${{ secrets.GCP_SA_KEY }} project_id: ${{ env.PROJECT_ID }} export_default_credentials: true - name: Login to GCP - uses: google-github-actions/auth@v2.1.6 + uses: google-github-actions/auth@v2.1.7 with: credentials_json: ${{ secrets.GCP_SA_KEY }} diff --git a/flake-module.nix b/flake-module.nix index bc34e84af..02882c8d7 100644 --- a/flake-module.nix +++ b/flake-module.nix @@ -8,7 +8,7 @@ ... }: let # this change on each change of dependencies, unfortunately this hash not yet automatically updated from SRI of package.lock - npmDepsHash = "sha256-UOX/9DrmX8dROI2mKCG8QP1KIxMNOimKAVyRxWMlYJ4="; + npmDepsHash = "sha256-j4M/Tdt28AnXmfaJZT1MHMWvtB+9+Ap24ncwofXcTWs="; #### # there is officia polkadot on nixpkgs, but it has no local rococo wasm to run diff --git a/javascript/package-lock.json b/javascript/package-lock.json index 615b9de50..ab475cc84 100644 --- a/javascript/package-lock.json +++ b/javascript/package-lock.json @@ -2215,9 +2215,9 @@ "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==" }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", + "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0",