Skip to content

Commit c073640

Browse files
authored
Merge branch 'pop-os:master' into rustc-hash
2 parents 78f2ed2 + 7cc28a9 commit c073640

File tree

5 files changed

+387
-407
lines changed

5 files changed

+387
-407
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- master
77
pull_request:
88

9-
env:
9+
env:
1010
CARGO_TERM_COLOR: always
1111

1212
jobs:
@@ -16,6 +16,7 @@ jobs:
1616
steps:
1717
- uses: actions/checkout@v4
1818
- run: sudo apt-get update; sudo apt-get install desktop-file-utils libclang-dev libglib2.0-dev libxkbcommon-dev
19-
- run: desktop-file-validate --no-hints ./res/com.system76.CosmicFiles.desktop
19+
# Disable until GitHub Actions uses Ubuntu 26.04.
20+
# - run: desktop-file-validate --no-hints ./res/com.system76.CosmicFiles.desktop
2021
- run: rustup update stable && rustup default stable
21-
- run: cargo test --verbose
22+
- run: cargo test --verbose

0 commit comments

Comments
 (0)