From 98077cf5acba25fb8422369053f39a6178d267f4 Mon Sep 17 00:00:00 2001 From: Rudxain <76864299+Rudxain@users.noreply.github.com> Date: Tue, 18 Feb 2025 11:13:40 -0400 Subject: [PATCH 1/3] hotfix: disable debug validation of pack-IDs --- src/core/adb.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/adb.rs b/src/core/adb.rs index 7cfd869..274e963 100644 --- a/src/core/adb.rs +++ b/src/core/adb.rs @@ -268,8 +268,8 @@ impl PmCommand { debug_assert!(p_ln.starts_with(PACK_PREFIX)); let p_id = &p_ln[PACK_PREFIX.len()..]; - #[cfg(debug_assertions)] - PackageId::new(p_id).expect(INVALID_PKG_ID); + //#[cfg(debug_assertions)] + //PackageId::new(p_id).expect(INVALID_PKG_ID); String::from(p_id) }) From 13bab7f0c481adb1b6904083778becfffe654462 Mon Sep 17 00:00:00 2001 From: Anonymoussaurus <50231698+AnonymousWP@users.noreply.github.com> Date: Wed, 19 Feb 2025 00:11:31 +0100 Subject: [PATCH 2/3] build(ci): version-pin OS of runners --- .github/workflows/build_artifacts.yml | 18 +++++++++--------- .github/workflows/ci.yml | 12 ++++++------ .github/workflows/release.yml | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml index 6108908..bb167e3 100644 --- a/.github/workflows/build_artifacts.yml +++ b/.github/workflows/build_artifacts.yml @@ -16,13 +16,13 @@ jobs: update_feature: no-self-update include: - build_target: linux - os: ubuntu-latest + os: ubuntu-22.04 - build_target: macos - os: macos-latest + os: macos-14 - build_target: macos-intel os: macos-13 - build_target: windows - os: windows-latest + os: windows-2022 - update_feature: self-update update_name: "" # we don't want this in the binary filename - update_feature: no-self-update @@ -41,26 +41,26 @@ jobs: target key: ${{ runner.os }}-release-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.OS }}-release- - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'ubuntu-22.04' - name: Building run: cargo build --release --no-default-features --features wgpu,${{ matrix.update_feature }} - name: Renaming binaries [Windows] - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' run: mv target/release/uad-ng.exe uad-ng-${{ matrix.build_target }}.exe - name: Renaming binaries [Others] - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' run: mv target/release/uad-ng uad-ng${{ matrix.update_name }}-${{ matrix.build_target }} - name: Tarball Linux/MacOS binary - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' run: tar -czf uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}{.tar.gz,} - name: Install coreutils for macOS if: startsWith(matrix.os, 'macos') run: brew install coreutils - name: Create checksums for binaries and archives [Windows] - if: matrix.os == 'windows-latest' + if: matrix.os == 'windows-2022' run: sha256sum uad-ng-${{ matrix.build_target }}.exe | tee uad-ng-${{ matrix.build_target }}.exe-checksum.txt - name: Create checksums for binaries and archives [Others] - if: matrix.os != 'windows-latest' + if: matrix.os != 'windows-2022' run: | sha256sum uad-ng${{ matrix.update_name }}-${{ matrix.build_target }} | tee uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}-checksum sha256sum uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}.tar.gz | tee uad-ng${{ matrix.update_name }}-${{ matrix.build_target }}.tar.gz-checksum diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 68b9c3c..755976d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,16 +21,16 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-latest, windows-latest, macOS-latest] + os: [ubuntu-22.04, windows-2022, macOS-14] lint: [check, test, clippy, fmt] exclude: # https://github.com/community/community/discussions/7835 - - os: windows-latest + - os: windows-2022 lint: clippy - - os: windows-latest + - os: windows-2022 lint: fmt - - os: macOS-latest + - os: macOS-14 lint: clippy - - os: macOS-latest + - os: macOS-14 lint: fmt include: - lint: check @@ -61,7 +61,7 @@ jobs: coverage: name: coverage - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 - uses: dtolnay/rust-toolchain@stable diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 731a72b..6ae4222 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,7 +14,7 @@ jobs: uses: ./.github/workflows/build_artifacts.yml release: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/') - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 needs: build permissions: contents: write From 60c89c887c2134733f68e82a876959a1db610802 Mon Sep 17 00:00:00 2001 From: Anonymoussaurus <50231698+AnonymousWP@users.noreply.github.com> Date: Wed, 19 Feb 2025 00:12:10 +0100 Subject: [PATCH 3/3] build(ci): upgrade GitHub release Action to v2 --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6ae4222..3baf45d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,7 @@ jobs: - name: Downloads artifacts uses: actions/download-artifact@v4 - name: Create release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: uad-ng-*/* generate_release_notes: true