Merge branch 'Universal-Debloater-Alliance:main' into main

This commit is contained in:
user583953 2025-02-21 21:47:00 +01:00 committed by GitHub
commit 498b42540c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 19 additions and 19 deletions

View file

@ -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

View file

@ -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

View file

@ -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
@ -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

View file

@ -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)
})