From 7da47daaf1432c066203f48a75118e638059b150 Mon Sep 17 00:00:00 2001
From: Paul Schoenfelder <paulschoenfelder@fastmail.com>
Date: Wed, 31 Aug 2022 16:15:31 -0600
Subject: [PATCH] ci: come on

---
 .../x86_64-unknown-linux-gnu-compiler.yml       | 17 +++++++++++++++--
 Makefile.toml                                   |  2 +-
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml b/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml
index 44a2a7a84..265272029 100644
--- a/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml
+++ b/.github/workflows/x86_64-unknown-linux-gnu-compiler.yml
@@ -1,6 +1,9 @@
 name: x86_64-unknown-linux-gnu compiler
 
-on: push
+on:
+  push:
+    paths-ignore:
+    - '*.md'
 
 env:
   TOOLCHAIN: nightly-2022-08-08
@@ -16,7 +19,10 @@ jobs:
       - uses: actions/checkout@v2
       - name: Setup Env
         run: |
-          if [ -n "${XDG_DATA_HOME}" ]; then
+          echo "$(whoami)"
+          if [ -z "${XDG_DATA_HOME}" ]; then
+            sudo mkdir -p $HOME/.local/share/llvm
+            sudo chown -R runner $HOME/.local/share/llvm
             echo "XDG_DATA_HOME=$HOME/.local/share" >> $GITHUB_ENV
           fi
           echo "$PWD/bin" >> $GITHUB_PATH
@@ -33,6 +39,10 @@ jobs:
           tar -xz --strip-components 1 -f clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
           rm clang+llvm-15.0.0-x86_64-linux-gnu.tar.gz
           cd -
+      - name: Install Toolchain
+        run: |
+          rustup toolchain install ${TOOLCHAIN}
+          rustup default ${TOOLCHAIN}
       - name: Cache Cargo
         uses: actions/cache@v2
         with:
@@ -43,15 +53,18 @@ jobs:
       - name: Install cargo-make
         uses: actions-rs/cargo@v1
         with:
+          toolchain: ${{ env.TOOLCHAIN }}
           command: install
           args: cargo-make
       - name: Build Compiler
         uses: actions-rs/cargo@v1
         with:
+          toolchain: ${{ env.TOOLCHAIN }}
           command: make
           args: firefly
       - name: Run lit tests
         uses: actions-rs/cargo@v1
         with:
+          toolchain: ${{ env.TOOLCHAIN }}
           command: make
           args: test-lit
diff --git a/Makefile.toml b/Makefile.toml
index ec2f35400..0e87a1879 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -72,7 +72,7 @@ CARGO_MAKE_RUST_SCRIPT_PROVIDER = "rust-script"
 CARGO_MAKE_USE_WORKSPACE_PROFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = "--no-fail-fast"
 CARGO_TARGET_DIR = { value = "${CARGO_MAKE_WORKSPACE_WORKING_DIRECTORY}/target", condition = { env_not_set = ["CARGO_TARGET_DIR"] } }
-CARGO_MAKE_TOOLCHAIN_DEFAULT = { source = "${CARGO_MAKE_CI}", default_value = "nightly", mapping = { "true" = "nightly-2022-07-12", "false" = "nightly" } }
+CARGO_MAKE_TOOLCHAIN_DEFAULT = { source = "${CARGO_MAKE_CI}", default_value = "nightly", mapping = { "true" = "nightly-2022-08-08", "false" = "nightly" } }
 CARGO_MAKE_TOOLCHAIN = { value = "${CARGO_MAKE_TOOLCHAIN_DEFAULT}", condition = { env_not_set = ["CARGO_MAKE_TOOLCHAIN"] } }
 BACKTRACE_DEFAULT = { source = "${CARGO_MAKE_CI}", mapping = { "true" = "1", "false" = "0" } }
 RUST_BACKTRACE = { value = "${BACKTRACE_DEFAULT}", condition = { env_not_set = ["RUST_BACKTRACE"] } }