Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/setup-node-4
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Dec 6, 2024
2 parents 0d059d9 + e2d5911 commit a12adf7
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
14 changes: 7 additions & 7 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions .github/workflows/k8s-cleaner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}

Expand Down
2 changes: 1 addition & 1 deletion flake-module.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions javascript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit a12adf7

Please sign in to comment.