Merge pull request #27 from Mic92/dependabot/github_actions/cachix/in…

…stall-nix-action-22

Bump cachix/install-nix-action from 21 to 22

.github/workflows/test.yml

@@ -4,8 +4,6 @@ on:
   push:
     branches:
       - main
-      - staging
-      - trying
   pull_request:
   schedule:
     - cron:  '51 2 * * *'
@@ -14,19 +12,19 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v21
+    - uses: cachix/install-nix-action@v22
     - run: nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz --pure -p gox -p go --run "gox -osarch '!darwin/386' ."
   tests:
     strategy:
       matrix:
         nixPath:
-          - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-22.11.tar.gz
+          - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-23.05.tar.gz
           - nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v3
-    - uses: cachix/install-nix-action@v21
+    - uses: cachix/install-nix-action@v22
       with:
         nix_path: "${{ matrix.nixPath }}"
     - name: Build nix packages

.mergify.yml

@@ -0,0 +1,24 @@
+queue_rules:
+  - name: default
+    merge_conditions:
+      - check-success=cross-build
+      - check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-22.11.tar.gz,
+        macos-latest)
+      - check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-22.11.tar.gz,
+        ubuntu-latest)
+      - check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz,
+        macos-latest)
+      - check-success=tests (nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz,
+        ubuntu-latest)
+defaults:
+  actions:
+    queue:
+      allow_merging_configuration_change: true
+      method: rebase
+pull_request_rules:
+  - name: merge using the merge queue
+    conditions:
+      - base=main
+      - label~=merge-queue|dependencies
+    actions:
+      queue: {}