From 83306d5ff2d2af0139d7aca94f6e270279bd2e01 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <gsimmer@protonmail.com>
Date: Tue, 25 Apr 2023 09:55:38 +0100
Subject: [PATCH] Merge test and mirror scripts, tweak rust version for gha

---
 .builds/mirror.yml            | 15 ---------------
 .builds/tests.yml             | 10 ++++++++++
 .github/workflows/release.yml |  3 +--
 3 files changed, 11 insertions(+), 17 deletions(-)
 delete mode 100644 .builds/mirror.yml

diff --git a/.builds/mirror.yml b/.builds/mirror.yml
deleted file mode 100644
index 4bbc6d0..0000000
--- a/.builds/mirror.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-image: alpine/edge
-packages:
-  - git
-secrets:
-  - 5799dead-65e5-4af2-9e1c-69fdfe664e15
-environment:
-  GITHUB_REPO: "gmemstr/osc-triggers" # Replace with your GitHub repo
-sources:
-  - https://git.sr.ht/~gmem/osc-triggers # Replace with your Sourcehut repo
-tasks:
-  - mirror-to-github: |
-      cd osc-triggers
-      git remote add github git@github.com:$GITHUB_REPO.git
-      ssh-keyscan github.com >> ~/.ssh/known_hosts
-      git push --mirror github
diff --git a/.builds/tests.yml b/.builds/tests.yml
index cac5db4..a2982e3 100644
--- a/.builds/tests.yml
+++ b/.builds/tests.yml
@@ -1,10 +1,20 @@
 image: nixos/latest
 sources:
   - https://git.sr.ht/~gmem/osc-triggers
+secrets:
+  - 5799dead-65e5-4af2-9e1c-69fdfe664e15
+packages:
+  - nixos.git
 environment:
   NIX_CONFIG: "experimental-features = nix-command flakes"
+  GITHUB_REPO: "gmemstr/osc-triggers"
 tasks:
   - check: |
       cd osc-triggers
       echo "Running nix flake check..."
       nix flake check
+  - mirror-to-github: |
+      cd osc-triggers
+      git remote add github git@github.com:$GITHUB_REPO.git
+      ssh-keyscan github.com >> ~/.ssh/known_hosts
+      git push --mirror github
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index b4bff79..04868e0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -25,8 +25,7 @@ jobs:
       - name: Install Rust
         uses: actions-rs/toolchain@v1
         with:
-          profile: minimal
-          toolchain: stable
+          toolchain: nightly
           target: ${{ matrix.target }}
           override: true