Skip to content

Commit 87180d0

Browse files
bilelmoussaouibilelmoussaoui
committed
CI: reformat yaml files
1 parent 31930e2 commit 87180d0

File tree

4 files changed

+130
-118
lines changed

4 files changed

+130
-118
lines changed

‎.github/workflows/CI.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,24 @@ jobs:
4141
- nightly
4242
- "1.70"
4343
conf:
44-
- { name: "gtk4", features: "v4_14,xml_validation,blueprint", test_sys: false }
44+
- {
45+
name: "gtk4",
46+
features: "v4_14,xml_validation,blueprint",
47+
test_sys: false,
48+
}
4549
- { name: "gsk4", features: "v4_14,broadway", test_sys: true }
4650
- { name: "gdk4", features: "v4_12,gl", test_sys: true }
47-
- { name: "gdk4-wayland", features: "v4_12,wayland_crate,egl,xkb_crate", test_sys: true }
51+
- {
52+
name: "gdk4-wayland",
53+
features: "v4_12,wayland_crate,egl,xkb_crate",
54+
test_sys: true,
55+
}
4856
- { name: "gdk4-x11", features: "v4_4,xlib,egl", test_sys: false }
49-
- { name: "gtk4-macros", features: "xml_validation,blueprint", test_sys: false }
57+
- {
58+
name: "gtk4-macros",
59+
features: "xml_validation,blueprint",
60+
test_sys: false,
61+
}
5062
steps:
5163
- uses: actions/checkout@v3
5264
- uses: actions-rs/toolchain@v1

‎.github/workflows/image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: github packages
33
on:
44
# Rebuild the container once every week
55
schedule:
6-
- cron: '0 1 * * 1'
6+
- cron: "0 1 * * 1"
77
push:
88
branches:
99
- "master"

‎.github/workflows/macos.yml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -21,31 +21,31 @@ on:
2121
jobs:
2222
ci-macos:
2323
name: macOS
24-
runs-on: macos-12
24+
runs-on: macos-12
2525
steps:
26-
- uses: actions/checkout@v3
27-
28-
- name: Install GTK
29-
run: |
30-
brew install gtk4
31-
32-
- name: Install Rust
33-
uses: actions-rs/toolchain@v1
34-
with:
35-
profile: minimal
36-
toolchain: stable
37-
components: clippy
38-
39-
- name: Build
40-
uses: actions-rs/cargo@v1
41-
with:
42-
command: build
43-
args: --features v4_10,xml_validation --manifest-path ./gtk4/Cargo.toml
44-
- name: Clippy
45-
uses: actions-rs/cargo@v1
46-
with:
47-
command: clippy
48-
args: --features v4_8,xml_validation --manifest-path ./gtk4/Cargo.toml
26+
- uses: actions/checkout@v3
27+
28+
- name: Install GTK
29+
run: |
30+
brew install gtk4
31+
32+
- name: Install Rust
33+
uses: actions-rs/toolchain@v1
34+
with:
35+
profile: minimal
36+
toolchain: stable
37+
components: clippy
38+
39+
- name: Build
40+
uses: actions-rs/cargo@v1
41+
with:
42+
command: build
43+
args: --features v4_10,xml_validation --manifest-path ./gtk4/Cargo.toml
44+
- name: Clippy
45+
uses: actions-rs/cargo@v1
46+
with:
47+
command: clippy
48+
args: --features v4_8,xml_validation --manifest-path ./gtk4/Cargo.toml
4949
# FIXME: renable once https://github.com/gtk-rs/gtk4-rs/issues/1235 is fixed
5050
#- name: Tests
5151
# uses: actions-rs/cargo@v1

‎.github/workflows/windows-msvc.yml

Lines changed: 90 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -28,96 +28,96 @@ jobs:
2828
PKG_CONFIG_PATH: 'C:\gnome\lib\pkgconfig'
2929

3030
steps:
31-
- uses: actions/checkout@v3
32-
- uses: actions/cache@v3
33-
id: cache
34-
with:
35-
path: c:/gnome
36-
key: ${{ runner.os }}-gtk4-14.2
37-
restore-keys: |
38-
${{ runner.os }}-gtk4-14.2
39-
40-
- name: Set up the PATH environment
41-
run: |
42-
echo "C:\pkg-config-lite-0.28-1\bin" >> $GITHUB_PATH
43-
echo "C:\gnome\bin" >> $GITHUB_PATH
44-
shell: bash
45-
46-
- name: Install pkgconfig-lite
47-
run: |
48-
Invoke-WebRequest -Uri https://deac-fra.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip -OutFile /pkg_config_lite.zip -MaximumRetryCount 5
49-
Expand-Archive /pkg_config_lite.zip -DestinationPath C:\
50-
ls C:\
51-
ls C:\pkg-config-lite-0.28-1
52-
ls C:\pkg-config-lite-0.28-1\bin
53-
pkg-config --version
31+
- uses: actions/checkout@v3
32+
- uses: actions/cache@v3
33+
id: cache
34+
with:
35+
path: c:/gnome
36+
key: ${{ runner.os }}-gtk4-14.2
37+
restore-keys: |
38+
${{ runner.os }}-gtk4-14.2
5439
55-
- name: Clone GTK
56-
working-directory: /
57-
if: steps.cache.outputs.cache-hit != 'true'
58-
run: |
59-
git clone https://gitlab.gnome.org/GNOME/gtk.git --depth 1
60-
61-
- name: Setup Python
62-
uses: actions/setup-python@v2
63-
with:
64-
python-version: '3.x'
65-
66-
- name: Install Python Dependencies
67-
run: pip install meson ninja
68-
69-
- name: Setup MSVC
70-
uses: bus1/cabuild/action/msdevshell@v1
71-
with:
72-
architecture: x64
73-
74-
- name: Install Rust
75-
uses: actions-rs/toolchain@v1
76-
with:
77-
profile: minimal
78-
toolchain: stable
79-
components: clippy
80-
81-
- name: Prepare GTK build
82-
working-directory: /gtk
83-
if: steps.cache.outputs.cache-hit != 'true'
84-
run: |
85-
meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Ddemos=false -Dbuild-tests=false -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled
86-
87-
- name: Build and install GTK
88-
working-directory: /gtk
89-
if: steps.cache.outputs.cache-hit != 'true'
90-
run: |
91-
meson install -C builddir
40+
- name: Set up the PATH environment
41+
run: |
42+
echo "C:\pkg-config-lite-0.28-1\bin" >> $GITHUB_PATH
43+
echo "C:\gnome\bin" >> $GITHUB_PATH
44+
shell: bash
9245

93-
- name: Build
94-
uses: actions-rs/cargo@v1
95-
with:
96-
command: build
97-
args: --features v4_14,xml_validation
98-
- name: Clippy
99-
uses: actions-rs/cargo@v1
100-
with:
101-
command: clippy
102-
args: --features v4_14,xml_validation
103-
- name: Tests
104-
uses: actions-rs/cargo@v1
105-
with:
106-
command: test
107-
args: --features v4_14,xml_validation
46+
- name: Install pkgconfig-lite
47+
run: |
48+
Invoke-WebRequest -Uri https://deac-fra.dl.sourceforge.net/project/pkgconfiglite/0.28-1/pkg-config-lite-0.28-1_bin-win32.zip -OutFile /pkg_config_lite.zip -MaximumRetryCount 5
49+
Expand-Archive /pkg_config_lite.zip -DestinationPath C:\
50+
ls C:\
51+
ls C:\pkg-config-lite-0.28-1
52+
ls C:\pkg-config-lite-0.28-1\bin
53+
pkg-config --version
10854
109-
- name: Build gdk-win32
110-
uses: actions-rs/cargo@v1
111-
with:
112-
command: build
113-
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
114-
- name: Clippy gdk-win32
115-
uses: actions-rs/cargo@v1
116-
with:
117-
command: clippy
118-
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
119-
- name: Tests gdk-win32
120-
uses: actions-rs/cargo@v1
121-
with:
122-
command: test
123-
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
55+
- name: Clone GTK
56+
working-directory: /
57+
if: steps.cache.outputs.cache-hit != 'true'
58+
run: |
59+
git clone https://gitlab.gnome.org/GNOME/gtk.git --depth 1
60+
61+
- name: Setup Python
62+
uses: actions/setup-python@v2
63+
with:
64+
python-version: "3.x"
65+
66+
- name: Install Python Dependencies
67+
run: pip install meson ninja
68+
69+
- name: Setup MSVC
70+
uses: bus1/cabuild/action/msdevshell@v1
71+
with:
72+
architecture: x64
73+
74+
- name: Prepare GTK build
75+
working-directory: /gtk
76+
if: steps.cache.outputs.cache-hit != 'true'
77+
run: |
78+
meson setup builddir --prefix=C:/gnome -Dbackend_max_links=1 -Ddemos=false -Dbuild-tests=false -Dmedia-gstreamer=disabled -Dbuild-examples=false -Dglib:tests=false -Dharfbuzz:tests=disabled -Dharfbuzz:docs=disabled -Dgraphene:tests=false -Dgdk-pixbuf:tests=false -Dcairo:tests=disabled
79+
80+
- name: Build and install GTK
81+
working-directory: /gtk
82+
if: steps.cache.outputs.cache-hit != 'true'
83+
run: |
84+
meson install -C builddir
85+
86+
- name: Install Rust
87+
uses: actions-rs/toolchain@v1
88+
with:
89+
profile: minimal
90+
toolchain: stable
91+
components: clippy
92+
93+
- name: Build
94+
uses: actions-rs/cargo@v1
95+
with:
96+
command: build
97+
args: --features v4_14,xml_validation
98+
- name: Clippy
99+
uses: actions-rs/cargo@v1
100+
with:
101+
command: clippy
102+
args: --features v4_14,xml_validation
103+
- name: Tests
104+
uses: actions-rs/cargo@v1
105+
with:
106+
command: test
107+
args: --features v4_14,xml_validation
108+
109+
- name: Build gdk-win32
110+
uses: actions-rs/cargo@v1
111+
with:
112+
command: build
113+
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
114+
- name: Clippy gdk-win32
115+
uses: actions-rs/cargo@v1
116+
with:
117+
command: clippy
118+
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml
119+
- name: Tests gdk-win32
120+
uses: actions-rs/cargo@v1
121+
with:
122+
command: test
123+
args: --features egl,win32 --manifest-path ./gdk4-win32/Cargo.toml

0 commit comments

Comments
 (0)