Skip to content

Commit de91ae9

Browse files
committed
Fix path to get the Qt license
Don't use Qt on the normal CI (no need) Update more deps
1 parent 1e26e09 commit de91ae9

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

.github/workflows/build_binary.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ jobs:
1616
with:
1717
toolchain: stable
1818
- name: Install Qt
19-
uses: jurplel/install-qt-action@v2
19+
uses: jurplel/install-qt-action@v3
2020
with:
2121
version: 6.5.0
2222
# - uses: Swatinem/rust-cache@v1
23-
- uses: actions-rs/install@v0.1
23+
- uses: baptiste0928/cargo-install@v2
2424
with:
2525
crate: cargo-about
2626
- name: Build
@@ -48,8 +48,8 @@ jobs:
4848
mkdir 3rdparty-licenses
4949
cd ..
5050
cd ..
51-
cp ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/LICENSE.QT pkg/cargo-ui/3rdparty-licenses/
52-
cp ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt pkg/cargo-ui/3rdparty-licenses/
51+
cp ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/LICENSE.QT pkg/cargo-ui/3rdparty-licenses/
52+
cp ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt pkg/cargo-ui/3rdparty-licenses/
5353
cp ../LICENSE-* pkg/cargo-ui/3rdparty-licenses/
5454
cargo about generate about.hbs -o pkg/cargo-ui/3rdparty-licenses/index.html
5555
- name: Upload artifact
@@ -74,12 +74,12 @@ jobs:
7474
path: ~/work/cargo-ui/Qt
7575
key: ${{ runner.os }}-${{ github.job }}-Qt
7676
- name: Install Qt
77-
uses: jurplel/install-qt-action@v2
77+
uses: jurplel/install-qt-action@v3
7878
with:
7979
version: 5.15.2
8080
cached: ${{ steps.cache-qt.outputs.cache-hit }}
8181
# - uses: Swatinem/rust-cache@v1
82-
- uses: actions-rs/install@v0.1
82+
- uses: baptiste0928/cargo-install@v2
8383
with:
8484
crate: cargo-about
8585
- name: Build
@@ -91,7 +91,7 @@ jobs:
9191
run: |
9292
mkdir -p cargo-ui/3rdparty-licenses
9393
cp ./target/release/cargo-ui ./cargo-ui/
94-
cp ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/LICENSE.QT ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt cargo-ui/3rdparty-licenses/
94+
cp ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/LICENSE.QT ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt cargo-ui/3rdparty-licenses/
9595
cp ./LICENSE-* cargo-ui/3rdparty-licenses/
9696
cargo about generate about.hbs -o cargo-ui/3rdparty-licenses/index.html
9797
- name: Tar artifacts to preserve permissions
@@ -123,12 +123,12 @@ jobs:
123123
path: ~/work/cargo-ui/Qt
124124
key: ${{ runner.os }}-${{ github.job }}-Qt
125125
- name: Install Qt
126-
uses: jurplel/install-qt-action@v2
126+
uses: jurplel/install-qt-action@v3
127127
with:
128128
version: 6.5.0
129129
cached: ${{ steps.cache-qt.outputs.cache-hit }}
130130
# - uses: Swatinem/rust-cache@v1
131-
- uses: actions-rs/install@v0.1
131+
- uses: baptiste0928/cargo-install@v2
132132
with:
133133
crate: cargo-about
134134
- name: Build x86_64
@@ -156,7 +156,7 @@ jobs:
156156
mkdir -p ./plugins/platforms
157157
cp -a ~/work/cargo-ui/Qt/6.5.0/macos/plugins/platforms/libqcocoa.dylib ./plugins/platforms
158158
cd ..
159-
cp ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/LICENSE.QT ~/.cargo/registry/src/github.com-1ecc6299db9ec823/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt cargo-ui/3rdparty-licenses/
159+
cp ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/LICENSE.QT ~/.cargo/registry/src/index.crates.io-6f17d22bba15001f/i-slint-backend-qt-1.*/QtThirdPartySoftware_Listing.txt cargo-ui/3rdparty-licenses/
160160
cp ./LICENSE-* cargo-ui/3rdparty-licenses/
161161
cargo about generate about.hbs -o cargo-ui/3rdparty-licenses/index.html
162162
- name: Tar artifacts to preserve permissions

.github/workflows/rust.yaml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,17 @@ jobs:
2121
- name: Install Linux Dependencies
2222
run: sudo apt-get install libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev
2323

24-
- name: Cache Qt
25-
id: cache-qt
26-
uses: actions/cache@v3
27-
with:
28-
path: ~/work/cargo-ui/Qt
29-
key: ${{ runner.os }}-${{ github.job }}-Qt
30-
- name: Install Qt
31-
uses: jurplel/install-qt-action@v2
32-
with:
33-
version: '5.15.2'
34-
cached: ${{ steps.cache-qt.outputs.cache-hit }}
24+
# - name: Cache Qt
25+
# id: cache-qt
26+
# uses: actions/cache@v3
27+
# with:
28+
# path: ~/work/cargo-ui/Qt
29+
# key: ${{ runner.os }}-${{ github.job }}-Qt
30+
# - name: Install Qt
31+
# uses: jurplel/install-qt-action@v3
32+
# with:
33+
# version: '5.15.2'
34+
# cached: ${{ steps.cache-qt.outputs.cache-hit }}
3535

3636
- uses: dtolnay/rust-toolchain@stable
3737
with:

0 commit comments

Comments
 (0)