Fix CI

.github/bors.toml

@@ -2,5 +2,5 @@ block_labels = ["needs-decision"]
 delete_merged_branches = true
 required_approvals = 1
 status = [
-    "build (1.62.0)",
+    "build (1.63.0)",
 ]

.github/workflows/ci.yaml

@@ -7,37 +7,29 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     continue-on-error: ${{ matrix.experimental || false }}
 
     strategy:
       matrix:
         rust:
-          - 1.62.0
-          - nightly
+          - 1.63.0 
+          - nightly-2022-08-12 #Since Rust 1.63.0 came out Aug 11 2022, we use nightly from the day after.
         include:
-          - rust: nightly
+          - rust: nightly-2022-08-12
             experimental: true
 
     steps:
       - uses: actions/checkout@v2
 
-      - name: Install Rust
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: rustfmt, clippy, llvm-tools-preview
-          target: thumbv7m-none-eabi
 
       - name: Install Python dependencies
         run: |
           pip3 install --user python-dateutil linkchecker
 
       - name: Cache installed binaries
-        uses: actions/cache@v1
+        uses: actions/cache@v4 
         id: cache-bin
         with:
           path: ~/cache-bin
@@ -50,13 +42,25 @@ jobs:
           crate: mdbook
           version: latest
 
+
       - name: Install cargo-binutils
         if: steps.cache-bin.outputs.cache-hit != 'true'
         uses: actions-rs/[email protected]
         with:
           crate: cargo-binutils
           version: latest
 
+        #Moved until after installing mdbook and cargo-binutils because otherwise installing them fails
+        #(note all GitHub runners come with the latest stable version of Rust pre-installed, and it is that version we want to install these).
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy, llvm-tools-preview
+          target: thumbv7m-none-eabi
+
       - name: Install arm-none-eabi-gcc and qemu
         if: steps.cache-bin.outputs.cache-hit != 'true'
         run: |
@@ -84,7 +88,7 @@ jobs:
           RUST_VERSION: ${{ matrix.rust }}
 
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
 
     needs: [build]
 
@@ -94,7 +98,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Cache installed binaries
-        uses: actions/cache@v1
+        uses:  actions/cache@v4
         id: cache-bin
         with:
           path: ~/cache-bin

.github/workflows/test_ci.yml

@@ -0,0 +1,119 @@
+name: test CI
+
+on:
+  workflow_dispatch: #Enables manual run of this workflow
+
+jobs:
+  build:
+    runs-on: ubuntu-latest #Version 20.04 is no longer supported (see https://github.com/actions/runner-images/issues/11101)
+
+    continue-on-error: ${{ matrix.experimental || false }}
+
+    strategy:
+      matrix:
+        rust:
+          - 1.63.0 #bump needed as otherwise the test script fails as package `cc v1.2.19` cannot be built because it requires rustc 1.63 or newer, while the currently active rustc version is 1.62.0
+          - nightly-2022-08-12 #Need to fix nightly to be an old version. 
+          #Needed because in ci/script.sh (the test script) some checks like "check presence of the `rust_begin_unwind` symbol" fail 
+          #(I think due to compilation differences between when this was made to the new nightly).
+          #Since Rust 1.63.0 came out Aug 11 2022, we use nightly from the day after.
+        include:
+          - rust: nightly-2022-08-12
+            experimental: true
+
+    steps:
+      - uses: actions/checkout@v2
+
+
+      - name: Install Python dependencies
+        run: |
+          pip3 install --user python-dateutil linkchecker
+
+      - name: Cache installed binaries
+        uses: actions/cache@v4 #v1 no longer supported: see https://github.blog/changelog/2024-12-05-notice-of-upcoming-releases-and-breaking-changes-for-github-actions/#actions-cache-v1-v2-and-actions-toolkit-cache-package-closing-down
+        id: cache-bin
+        with:
+          path: ~/cache-bin
+          key: cache-bin
+
+      - name: Install mdbook
+        if: steps.cache-bin.outputs.cache-hit != 'true'
+        uses: actions-rs/[email protected]
+        with:
+          crate: mdbook
+          version: latest
+
+
+      - name: Install cargo-binutils
+        if: steps.cache-bin.outputs.cache-hit != 'true'
+        uses: actions-rs/[email protected]
+        with:
+          crate: cargo-binutils
+          version: latest
+
+        #Moved untill after installing mdbook and cargo-binutils because otherwise installing them fails
+        #(note all GitHub runners come with the latest stable version of Rust pre-installed and it is that version we want to install these).
+      - name: Install Rust
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+          components: rustfmt, clippy, llvm-tools-preview
+          target: thumbv7m-none-eabi
+
+      - name: Install arm-none-eabi-gcc and qemu
+        if: steps.cache-bin.outputs.cache-hit != 'true'
+        run: |
+          mkdir -p ~/cache-bin/arm_gcc
+          curl -L https://developer.arm.com/-/media/Files/downloads/gnu-rm/10.3-2021.07/gcc-arm-none-eabi-10.3-2021.07-x86_64-linux.tar.bz2 \
+            | tar --strip-components=1 -C ~/cache-bin/arm_gcc -xj
+
+          curl -L https://github.com/japaric/qemu-bin/raw/master/14.04/qemu-system-arm-2.12.0 \
+            > ~/cache-bin/qemu-system-arm
+          chmod a+x ~/cache-bin/qemu-system-arm
+
+      - name: Copy installed binaries to cache directory
+        if: steps.cache-bin.outputs.cache-hit != 'true'
+        run: |
+          cp ~/.cargo/bin/* ~/cache-bin
+
+      - name: Put new bin directory into path
+        run: |
+          echo "$HOME/cache-bin" >> $GITHUB_PATH
+          echo "$HOME/cache-bin/arm_gcc/bin" >> $GITHUB_PATH
+
+      - name: Test
+        run: bash ci/script.sh
+        env:
+          RUST_VERSION: ${{ matrix.rust }}
+
+  deploy:
+    runs-on: ubuntu-latest #Version 20.04 is no longer supported (see https://github.com/actions/runner-images/issues/11101)
+
+    needs: [build]
+
+    if: github.event_name == 'push' && github.ref == 'refs/heads/master'
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Cache installed binaries
+        uses:  actions/cache@v4 #v1 no longer supported: see https://github.blog/changelog/2024-12-05-notice-of-upcoming-releases-and-breaking-changes-for-github-actions/#actions-cache-v1-v2-and-actions-toolkit-cache-package-closing-down
+        id: cache-bin
+        with:
+          path: ~/cache-bin
+          key: cache-bin
+
+      - name: Put new bin directory into path
+        run: echo "$HOME/cache-bin" >> $GITHUB_PATH
+
+      - name: Build the book
+        run: mdbook build
+
+      - name: Deploy book
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: book
+          force_orphan: true

ci/logging/app/.cargo/config → ci/logging/app/.cargo/config.toml

@@ -3,4 +3,4 @@ runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semiho
 rustflags = ["-C", "link-arg=-Tlink.x"]
 
 [build]
-target = "thumbv7m-none-eabi"
+target = "thumbv7m-none-eabi"

ci/logging/app2/.cargo/config → ci/logging/app2/.cargo/config.toml

@@ -6,4 +6,4 @@ rustflags = [
 ]
 
 [build]
-target = "thumbv7m-none-eabi"
+target = "thumbv7m-none-eabi"

ci/memory-layout/.cargo/config → ci/memory-layout/.cargo/config.toml

@@ -2,4 +2,4 @@
 rustflags = ["-C", "link-arg=-Tlink.x"]
 
 [build]
-target = "thumbv7m-none-eabi"
+target = "thumbv7m-none-eabi"

ci/script.sh

@@ -42,6 +42,7 @@ main() {
     diff app.o.nm \
         <(cargo nm -- $(pwd)/target/thumbv7m-none-eabi/debug/deps/app-*.o | grep '[0-9]* [^N] ')
 
+
     edition_check
 
     popd
@@ -86,7 +87,7 @@ main() {
     popd
 
     # NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
-    if [ $RUST_VERSION = nightly ]; then
+    if [ $RUST_VERSION = nightly-2022-08-12 ]; then
         pushd app4
         cargo build
         qemu_check target/thumbv7m-none-eabi/debug/app
@@ -96,9 +97,11 @@ main() {
 
     popd
 
+
+    #FIXME: This fails on nightly-2022-08-12, but we need at least rust 1.63.0 or other things fail. This needs to be fixed manually.
     # # exception handling
     # NOTE(nightly) this will require nightly until core::arch::arm::udf is stabilized
-    if [ $RUST_VERSION = nightly ]; then
+    if [ $RUST_VERSION = FIXME ]; then
         pushd exceptions
 
         # check that the disassembly matches
@@ -231,7 +234,7 @@ main() {
 
     # # DMA
     # NOTE(nightly) this will require nightly until core::pin is stabilized (1.33)
-    if [ $RUST_VERSION = nightly ]; then
+    if [ $RUST_VERSION = nightly-2022-08-12 ]; then
         pushd dma
         cargo build --examples
         popd

ci/smallest-no-std/.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+target = "thumbv7m-none-eabi"