ci: try again to fix git-version issue

Just use the rustup provided by GHA, that *should* work for cases where nothing special is required
MakerSpaceNewcastle · Dec 4, 2024 · 190bcd3 · 190bcd3
1 parent 0810187
commit 190bcd3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.github/workflows/peripheral-controller-firmware.yml b/.github/workflows/peripheral-controller-firmware.yml
@@ -6,11 +6,13 @@ on:
     branches:
       - main
     paths:
+      - '.github/workflows/peripheral-controller.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'peripheral-controller/firmware/**'
   pull_request:
     paths:
+      - '.github/workflows/peripheral-controller.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'peripheral-controller/firmware/**'
@@ -30,7 +32,6 @@ jobs:
 
       - name: Clippy
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup target add thumbv6m-none-eabi
@@ -54,7 +55,6 @@ jobs:
 
       - name: Build
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup target add thumbv6m-none-eabi

diff --git a/.github/workflows/telemetry-module-firmware.yml b/.github/workflows/telemetry-module-firmware.yml
@@ -6,11 +6,13 @@ on:
     branches:
       - main
     paths:
+      - '.github/workflows/telemetry-module-firmware.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'telemetry-module/firmware/**'
   pull_request:
     paths:
+      - '.github/workflows/telemetry-module-firmware.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'telemetry-module/firmware/**'
@@ -33,7 +35,6 @@ jobs:
           WIFI_PASSWORD: "loool dont steal me"
           MQTT_PASSWORD: "not real"
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup target add thumbv6m-none-eabi
@@ -60,7 +61,6 @@ jobs:
           WIFI_PASSWORD: "loool dont steal me"
           MQTT_PASSWORD: "not real"
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup target add thumbv6m-none-eabi

diff --git a/.github/workflows/telemetry-receiver.yml b/.github/workflows/telemetry-receiver.yml
@@ -6,11 +6,13 @@ on:
     branches:
       - main
     paths:
+      - '.github/workflows/telemetry-receiver.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'peripheral-controller/telemetry-receiver/**'
   pull_request:
     paths:
+      - '.github/workflows/telemetry-receiver.yml'
       - 'flake.*'
       - 'peripheral-controller/telemetry-protocol/**'
       - 'peripheral-controller/telemetry-receiver/**'
@@ -28,9 +30,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v30
 
+      - name: Install system dependencies
+        run: |
+          set -x
+          sudo apt install --yes libudev-dev
+
       - name: Clippy
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup show
@@ -51,9 +57,13 @@ jobs:
       - uses: actions/checkout@v4
       - uses: cachix/install-nix-action@v30
 
+      - name: Install system dependencies
+        run: |
+          set -x
+          sudo apt install --yes libudev-dev
+
       - name: Build
         run: |
-          eval "$(nix print-dev-env)"
           set -x
 
           rustup show