Merge branch 'main' into development

Nukesor · Jan 29, 2024 · edf8a74 · edf8a74
2 parents c271c2f + 8ef8136
commit edf8a74
Show file tree

Hide file tree

Showing 16 changed files with 306 additions and 320 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -40,12 +40,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
           components: llvm-tools-preview
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
 
       - uses: actions/cache@v3
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -56,12 +56,10 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
-          components: rustfmt, clippy
-          target: ${{ matrix.target }}
+          components: llvm-tools-preview
+          targets: ${{ matrix.target }}
 
       - uses: actions/cache@v3
         with:
@@ -77,13 +75,7 @@ jobs:
             ${{ runner.os }}-cargo-${{ matrix.target }}-
 
       - name: cargo fmt
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        run : cargo fmt --all -- --check
 
       - name: cargo clippy
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: --tests --workspace -- -D warnings
+        run: cargo clippy --tests --workspace -- -D warnings
diff --git a/.github/workflows/package-binary.yml b/.github/workflows/package-binary.yml
@@ -83,18 +83,17 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          target: ${{ matrix.target }}
-          override: true
+          components: llvm-tools-preview
+          targets: ${{ matrix.target }}
 
       - name: cargo build
-        uses: actions-rs/cargo@v1
+        uses: houseabsolute/actions-rust-cross@v0
         with:
           command: build
-          args: --release --locked --target=${{ matrix.target }}
-          use-cross: ${{ matrix.cross }}
+          args: --release --locked
+          target: ${{ matrix.target }}
 
       - name: Compress client
         uses: svenstaro/upx-action@v2

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -39,49 +39,46 @@ jobs:
           - os: ubuntu-latest
             target: x86_64-unknown-linux-gnu
             cross: false
-            strip: true
           - os: ubuntu-latest
             target: aarch64-unknown-linux-musl
             cross: true
-            strip: false
           - os: ubuntu-latest
             target: armv7-unknown-linux-musleabihf
             cross: true
-            strip: false
           - os: ubuntu-latest
             target: arm-unknown-linux-musleabihf
             cross: true
-            strip: false
           - os: windows-latest
             target: x86_64-pc-windows-msvc
             cross: false
-            strip: true
           - os: macos-latest
             target: x86_64-apple-darwin
             cross: false
-            strip: true
           - os: macos-latest
             target: aarch64-apple-darwin
             cross: true
-            strip: true
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
 
       - name: Setup Rust toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: stable
-          override: true
           components: llvm-tools-preview
-          target: ${{ matrix.target }}
+          targets: ${{ matrix.target }}
 
       - name: Install cargo-nextest
         uses: taiki-e/install-action@v2
         with:
           tool: nextest
 
+      - name: Install cargo-cross
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cross
+        if: ${{ matrix.cross }}
+
       - uses: actions/cache@v3
         with:
           path: |
@@ -94,24 +91,37 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-cargo-${{ matrix.target }}-
 
+      # ----- Non-Cross path
       - name: cargo build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --target=${{ matrix.target }}
-          use-cross: ${{ matrix.cross }}
+        run: cargo build --target=${{ matrix.target }}
+        if: ${{ !matrix.cross }}
 
       - name: cargo test
-        uses: actions-rs/cargo@v1
-        if: ${{ !matrix.cross }}
+        run: cargo nextest run --workspace --target=${{ matrix.target }}
         env:
           NEXTEST_PROFILE: ci # defined in .config/nextest.toml
-        with:
-          command: nextest
-          args: run --workspace --target=${{ matrix.target }}
-          use-cross: ${{ matrix.cross }}
+        if: ${{ !matrix.cross }}
+
+      # ----- Cross path
+      #- name: Install qemu
+      #  run: apt-get install --assume-yes binfmt-support qemu-user-static qemu-user
+      #  if: ${{ matrix.cross }}
+
+      - name: cargo build
+        run: cross build --target=${{ matrix.target }}
+        if: ${{ matrix.cross }}
+
+      # We don't do automated testing for cross builds yet.
+      # - They don't work in the CI. I have yet to figure out why things aren't set up properly.
+      # - The tests run way to slow and all kinds of race conditions are triggered.
+      #   Until we find a way to run time related tests in an ultra slow environment, this needs to be postponed.
+      #- name: cargo test
+      #  run: cross test run --workspace --target=${{ matrix.target }}
+      #  env:
+      #    NEXTEST_PROFILE: ci # defined in .config/nextest.toml
+      #  if: ${{ matrix.cross }}
 
-      # The test result artifacts are used by the test-report.yaml workflow.
+      # ----- Test result artifacts are used by the test-report.yaml workflow.
       - name: upload test results
         uses: actions/upload-artifact@v3
         if: ${{ !matrix.cross }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ### Fixed
 
+- Include priority in `Task`s' `Debug` output
+
 ## [3.3.3] - 2024-01-04
 
 ### Fixed