Skip to content
This repository was archived by the owner on Mar 4, 2024. It is now read-only.

Commit 2e589de

Browse files
Merge pull request #340 from gtk-rs/bilelmoussaoui/use-new-ci-image
CI: use the new docker image
2 parents ca37fcf + ed352ee commit 2e589de

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: ${{matrix.conf.name}} (rust ${{matrix.rust}})
1111
runs-on: ubuntu-latest
1212
container:
13-
image: ubuntu:20.10
13+
image: ghcr.io/gtk-rs/gtk-rs/gtk:latest
1414
strategy:
1515
matrix:
1616
rust:
@@ -31,8 +31,6 @@ jobs:
3131
- { name: "pango", features: "v1_46", nightly: "--all-features", test_sys: false }
3232
- { name: "pangocairo", features: "", nightly: "--all-features", test_sys: true }
3333
steps:
34-
- run: apt-get update -y
35-
- run: apt-get install -y libgtk-3-dev libglib2.0-dev libgraphene-1.0-dev git xvfb curl libcairo-gobject2 libcairo2-dev
3634
- uses: actions/checkout@v2
3735
- uses: actions-rs/toolchain@v1
3836
with:
@@ -114,7 +112,7 @@ jobs:
114112
build-others:
115113
runs-on: ubuntu-latest
116114
container:
117-
image: ubuntu:20.10
115+
image: ghcr.io/gtk-rs/gtk-rs/gtk:latest
118116
strategy:
119117
matrix:
120118
rust:
@@ -123,8 +121,6 @@ jobs:
123121
- nightly
124122
- "1.48.0"
125123
steps:
126-
- run: apt-get update -y
127-
- run: apt-get install -y libgtk-3-dev libglib2.0-dev libgraphene-1.0-dev git xvfb curl libcairo-gobject2 libcairo2-dev
128124
- uses: actions/checkout@v2
129125
- uses: actions-rs/toolchain@v1
130126
with:

.github/workflows/docs.yml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@ jobs:
1010
runs-on: ubuntu-latest
1111
name: build
1212
container:
13-
image: ubuntu:20.10
13+
image: ghcr.io/gtk-rs/gtk-rs/gtk:latest
1414
steps:
15-
- run: apt-get update -y
16-
- run: apt-get install -y libgtk-3-dev libglib2.0-dev libgraphene-1.0-dev git curl libcairo-gobject2 libcairo2-dev
1715
- uses: actions/checkout@v2
1816
with:
1917
submodules: recursive
@@ -47,7 +45,7 @@ jobs:
4745
with:
4846
command: doc
4947
args: -p atk -p atk-sys -p cairo-rs -p cairo-sys-rs -p gdk -p gdk-sys -p gdk-pixbuf -p gdk-pixbuf-sys -p gdkx11 -p gdkx11-sys -p gio -p gio-sys -p glib -p gobject-sys -p glib-sys -p glib-macros -p graphene-rs -p graphene-sys -p gtk -p gtk-sys -p pango -p pango-sys -p pangocairo -p pangocairo-sys --all-features --no-deps
50-
env:
48+
env:
5149
RUSTDOCFLAGS: "--enable-index-page -Zunstable-options"
5250

5351
- name: deploy

.github/workflows/image.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
paths:
66
- "Dockerfile"
7-
branches:
8-
- "master"
97

108
jobs:
119
docker:

0 commit comments

Comments
 (0)