From d43bfec582355fe214a7f546870e0af8b79ac2c0 Mon Sep 17 00:00:00 2001
From: Noah Santschi-Cooney <noah@santschi-cooney.ch>
Date: Sat, 23 Apr 2022 23:15:45 +0100
Subject: [PATCH] v0.9.6: now with fixed CI

---
 .github/workflows/release.yml | 10 ++++++----
 .github/workflows/server.yml  |  1 -
 CHANGELOG.md                  |  1 -
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index bae3792..fbe234e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -34,20 +34,20 @@ jobs:
         platforms:
         - os: ubuntu-18.04
           target: x86_64-unknown-linux-gnu
-          artifact: x86_64-unknown-linux-gnu
           dir: server/mcshader-lsp
+          artifact: x86_64-unknown-linux-gnu
         - os: windows-latest
           target: x86_64-pc-windows-msvc
-          artifact: x86_64-windows-msvc.exe
           dir: server/mcshader-lsp.exe
+          artifact: x86_64-windows-msvc.exe
         - os: macos-11
           target: x86_64-apple-darwin
-          artifact: x86_64-apple-darwin
           dir: server/mcshader-lsp
+          artifact: x86_64-apple-darwin
         - os: macos-11
           target: aarch64-apple-darwin
-          artifact: aarch64-apple-darwin
           dir: server/mcshader-lsp
+          artifact: aarch64-apple-darwin
     steps:
     - uses: actions/checkout@v2
     - name: Install latest nightly
@@ -55,6 +55,8 @@ jobs:
       with:
           toolchain: nightly
           default: true
+          target: ${{ matrix.platforms.target }}
+          override: true
     - name: Build server
       run: cargo build --release --target ${{ matrix.platforms.target }} --out-dir . -Z unstable-options
     - name: Upload release file
diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
index 8c3e4ee..0e254c7 100644
--- a/.github/workflows/server.yml
+++ b/.github/workflows/server.yml
@@ -48,4 +48,3 @@ jobs:
         path: ${{ matrix.platforms.dir }}
     - name: Run tests
       run: cargo test --target ${{ matrix.platforms.target }}
-      if: ${{ matrix.platforms.target != 'aarch64-apple-darwin' }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff0f6f0..30096bc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 
 - Another `#include` merging bug when a file is imported twice into another file at different lines
 
-
 ## [0.9.5]
 
 ### Added