fix(ci): Revert llvm-project#153385 workaround
LLVM was removed from the runner image, so this workaround (and dodgy clang manual pkg selection) is no longer necessary Signed-off-by: Ellis Git <forgejo@mail.ellis.link>
This commit is contained in:
parent
c40cc3b236
commit
1695b6d19e
1 changed files with 23 additions and 23 deletions
|
|
@ -30,28 +30,28 @@ jobs:
|
||||||
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
echo "version=$VERSION" >> $GITHUB_OUTPUT
|
||||||
echo "distribution=$DISTRIBUTION" >> $GITHUB_OUTPUT
|
echo "distribution=$DISTRIBUTION" >> $GITHUB_OUTPUT
|
||||||
echo "Debian distribution: $DISTRIBUTION ($VERSION)"
|
echo "Debian distribution: $DISTRIBUTION ($VERSION)"
|
||||||
- name: Work around llvm-project#153385
|
#- name: Work around llvm-project#153385
|
||||||
id: llvm-workaround
|
# id: llvm-workaround
|
||||||
run: |
|
# run: |
|
||||||
if [ -f /usr/share/apt/default-sequoia.config ]; then
|
# if [ -f /usr/share/apt/default-sequoia.config ]; then
|
||||||
echo "Applying workaround for llvm-project#153385"
|
# echo "Applying workaround for llvm-project#153385"
|
||||||
mkdir -p /etc/crypto-policies/back-ends/
|
# mkdir -p /etc/crypto-policies/back-ends/
|
||||||
cp /usr/share/apt/default-sequoia.config /etc/crypto-policies/back-ends/apt-sequoia.config
|
# cp /usr/share/apt/default-sequoia.config /etc/crypto-policies/back-ends/apt-sequoia.config
|
||||||
sed -i 's/\(sha1\.second_preimage_resistance = \)2026-02-01/\12026-06-01/' /etc/crypto-policies/back-ends/apt-sequoia.config
|
# sed -i 's/\(sha1\.second_preimage_resistance = \)2026-02-01/\12026-06-01/' /etc/crypto-policies/back-ends/apt-sequoia.config
|
||||||
else
|
# else
|
||||||
echo "No workaround needed for llvm-project#153385"
|
# echo "No workaround needed for llvm-project#153385"
|
||||||
fi
|
# fi
|
||||||
- name: Pick compatible clang version
|
#- name: Pick compatible clang version
|
||||||
id: clang-version
|
# id: clang-version
|
||||||
run: |
|
# run: |
|
||||||
# both latest need to use clang-23, but oldstable and previous can just use clang
|
# # both latest need to use clang-23, but oldstable and previous can just use clang
|
||||||
if [[ "${{ matrix.container }}" == "ubuntu-latest" || "${{ matrix.container }}" == "debian-latest" ]]; then
|
# if [[ "${{ matrix.container }}" == "ubuntu-latest" || "${{ matrix.container }}" == "debian-latest" ]]; then
|
||||||
echo "Using clang-23 package for ${{ matrix.container }}"
|
# echo "Using clang-23 package for ${{ matrix.container }}"
|
||||||
echo "version=clang-23" >> $GITHUB_OUTPUT
|
# echo "version=clang-23" >> $GITHUB_OUTPUT
|
||||||
else
|
# else
|
||||||
echo "Using default clang package for ${{ matrix.container }}"
|
# echo "Using default clang package for ${{ matrix.container }}"
|
||||||
echo "version=clang" >> $GITHUB_OUTPUT
|
# echo "version=clang" >> $GITHUB_OUTPUT
|
||||||
fi
|
# fi
|
||||||
|
|
||||||
- name: Checkout repository with full history
|
- name: Checkout repository with full history
|
||||||
uses: actions/checkout@v6
|
uses: actions/checkout@v6
|
||||||
|
|
@ -127,7 +127,7 @@ jobs:
|
||||||
run: |
|
run: |
|
||||||
apt-get update -y
|
apt-get update -y
|
||||||
# Build dependencies for rocksdb
|
# Build dependencies for rocksdb
|
||||||
apt-get install -y liburing-dev ${{ steps.clang-version.outputs.version }}
|
apt-get install -y liburing-dev clang
|
||||||
|
|
||||||
- name: Run cargo-deb
|
- name: Run cargo-deb
|
||||||
id: cargo-deb
|
id: cargo-deb
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue