Skip to content

Commit 07ce9cd

Browse files
qarminqarmin
committed
TST
1 parent 8ed221a commit 07ce9cd

File tree

5 files changed

+28
-22
lines changed

5 files changed

+28
-22
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ jobs:
3030
run: rustup default 1.85.0
3131

3232
- name: Build Release
33-
if: ${{ github.ref == 'refs/heads/master' }}
33+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
3434
run: |
35-
sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
35+
sed -i 's/#lto = /lto = /g' Cargo.toml
3636
3737
echo "VERS=release" >> $GITHUB_ENV
3838
@@ -107,7 +107,7 @@ jobs:
107107
czkawka_all.7z
108108
109109
- name: Release
110-
if: ${{ github.ref == 'refs/heads/master' }}
110+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
111111
uses: softprops/action-gh-release@v2
112112
with:
113113
tag_name: "Nightly"
@@ -143,9 +143,9 @@ jobs:
143143
rustup target add x86_64-unknown-linux-musl
144144
145145
- name: Build Release
146-
if: ${{ github.ref == 'refs/heads/master' }}
146+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
147147
run: |
148-
sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
148+
sed -i 's/#lto = /lto = /g' Cargo.toml
149149
cargo build --release --bin czkawka_cli --target x86_64-unknown-linux-musl
150150
151151
mv target/x86_64-unknown-linux-musl/release/czkawka_cli linux_czkawka_cli_musl
@@ -168,7 +168,7 @@ jobs:
168168
169169
- name: Release
170170
uses: softprops/action-gh-release@v2
171-
if: ${{ github.ref == 'refs/heads/master' }}
171+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
172172
with:
173173
tag_name: "Nightly"
174174
files: |
@@ -211,7 +211,7 @@ jobs:
211211
linux_krokiet_32bit
212212
213213
linux-stability:
214-
if: ${{ github.ref == 'refs/heads/master' }} # Runs only in master, because it is really time consumig
214+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }} # Runs only in master, because it is really time consumig
215215
runs-on: ubuntu-22.04
216216
steps:
217217
- uses: actions/checkout@v4

‎.github/workflows/mac.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
# brew link --overwrite [email protected]
3737
3838
- name: Build Release
39-
if: ${{ github.ref == 'refs/heads/master' }}
39+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
4040
run: |
4141
set -e
4242
sed -i '' 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
@@ -89,7 +89,7 @@ jobs:
8989
macos_krokiet_${{ env.ARCHNAME }}
9090
9191
- name: Release
92-
if: ${{ github.ref == 'refs/heads/master' }}
92+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
9393
uses: softprops/action-gh-release@v2
9494
with:
9595
tag_name: "Nightly"

‎.github/workflows/windows.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ jobs:
2424
rustup target add x86_64-pc-windows-gnu
2525
2626
- name: Compile Krokiet Release
27-
if: ${{ github.ref == 'refs/heads/master' }}
27+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
2828
run: |
29-
sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
29+
sed -i 's/#lto = /lto = /g' Cargo.toml
3030
cargo build --release --target x86_64-pc-windows-gnu --bin krokiet
3131
mv target/x86_64-pc-windows-gnu/release/krokiet.exe windows_krokiet_on_linux.exe
3232
@@ -53,7 +53,7 @@ jobs:
5353

5454
- name: Release
5555
uses: softprops/action-gh-release@v2
56-
if: ${{ github.ref == 'refs/heads/master' }}
56+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
5757
with:
5858
tag_name: "Nightly"
5959
files: |
@@ -73,9 +73,9 @@ jobs:
7373
# rustup default 1.85.0
7474
#
7575
# - name: Compile Krokiet Release
76-
# if: ${{ github.ref == 'refs/heads/master' }}
76+
# if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
7777
# run: |
78-
# sed -i 's/#lto = "thin"/lto = "thin"/g' Cargo.toml
78+
# sed -i 's/#lto = /lto = /g' Cargo.toml
7979
# cargo build --release --bin krokiet --no-default-features --features "winit_skia_opengl,winit_software"
8080
# mv target/release/krokiet.exe windows_krokiet_on_windows_skia_opengl.exe
8181
# cargo build --release --bin krokiet --no-default-features --features "winit_skia_vulkan,winit_software"
@@ -102,7 +102,7 @@ jobs:
102102
#
103103
# - name: Release
104104
# uses: softprops/action-gh-release@v2
105-
# if: ${{ github.ref == 'refs/heads/master' }}
105+
# if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
106106
# with:
107107
# tag_name: "Nightly"
108108
# files: |
@@ -126,7 +126,7 @@ jobs:
126126
rustup target add x86_64-pc-windows-gnu
127127
128128
- name: Cross compile for Windows - Release
129-
if: ${{ github.ref == 'refs/heads/master' }}
129+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
130130
run: |
131131
source "$HOME/.cargo/env"
132132
#!/bin/bash
@@ -186,7 +186,7 @@ jobs:
186186
187187
- name: Release
188188
uses: softprops/action-gh-release@v2
189-
if: ${{ github.ref == 'refs/heads/master' }}
189+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
190190
with:
191191
tag_name: "Nightly"
192192
files: |
@@ -195,7 +195,7 @@ jobs:
195195

196196
container_4_6:
197197
runs-on: ubuntu-latest
198-
if: ${{ github.ref == 'refs/heads/master' }}
198+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
199199
container:
200200
image: ghcr.io/piegamesde/gtk4-cross:gtk-4.6
201201
steps:
@@ -210,7 +210,7 @@ jobs:
210210
rustup target add x86_64-pc-windows-gnu
211211
212212
- name: Cross compile for Windows - Release
213-
if: ${{ github.ref == 'refs/heads/master' }}
213+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
214214
run: |
215215
source "$HOME/.cargo/env"
216216
#!/bin/bash
@@ -270,7 +270,7 @@ jobs:
270270
271271
- name: Release
272272
uses: softprops/action-gh-release@v2
273-
if: ${{ github.ref == 'refs/heads/master' }}
273+
if: ${{ github.ref != 'refs/heads/masterrrrrrrr' }}
274274
with:
275275
tag_name: "Nightly"
276276
files: |

‎misc/generate_md_and_plots.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def plot_barh(
4848
data = data.dropna(subset=[value_col])
4949
data_sorted = data.sort_values(value_col, ascending=False)
5050

51-
plt.figure(figsize=(12, 9))
51+
plt.figure(figsize=(12, 10))
5252
bars = plt.barh(data_sorted["Config"], data_sorted[value_col] / unit_div, color=color)
5353

5454
ax = plt.gca()

‎misc/test_compilation_speed_size/src/main.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,9 +195,13 @@ fn get_configs(cranelift: bool) -> Vec<Config> {
195195
release_incremental.name = "release + incremental";
196196
release_incremental.incremental = Incremental::On;
197197

198+
let mut release_incremental_lto = release_base.clone();
199+
release_incremental_lto.name = "release + incremental + fat lto";
200+
release_incremental_lto.incremental = Incremental::On;
201+
release_incremental_lto.lto = Lto::Fat;
202+
198203
let configs = vec![
199204
// debug_split_debug,
200-
release_incremental,
201205
debug_base,
202206
debug_fast_check,
203207
check_fast_check,
@@ -213,6 +217,8 @@ fn get_configs(cranelift: bool) -> Vec<Config> {
213217
release_o2,
214218
release_o1,
215219
release_fastest_with_build_std,
220+
release_incremental,
221+
release_incremental_lto
216222
];
217223

218224
// For cranelift filter out configs with lto which is not supported

0 commit comments

Comments
 (0)