Skip to content

Commit ff32128

Browse files
authored
Merge branch 'JuliaGraphics:master' into master
2 parents 044e64d + 881fdce commit ff32128

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+2140
-8069
lines changed

.drone.jsonnet

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
local Pipeline(os, arch, version) = {
2+
kind: "pipeline",
3+
name: os+" - "+arch+" - Julia "+version,
4+
platform: {
5+
os: os,
6+
arch: arch
7+
},
8+
steps: [
9+
{
10+
name: "build",
11+
image: "julia:"+version,
12+
commands: [
13+
"apt-get update",
14+
"apt-get install -y xvfb xauth",
15+
"xvfb-run julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
16+
]
17+
}
18+
],
19+
trigger: {
20+
branch: ["master"]
21+
}
22+
};
23+
24+
[
25+
# Pipeline("linux", "arm", "1.6"),
26+
Pipeline("linux", "arm64", "1.6"),
27+
]

.drone.yml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
kind: pipeline
3+
name: linux - arm64 - Julia 1.6
4+
5+
platform:
6+
os: linux
7+
arch: arm64
8+
9+
steps:
10+
- name: build
11+
image: julia:1.6
12+
commands:
13+
- apt-get update
14+
- apt-get install -y xvfb xauth
15+
- "xvfb-run julia --project=. --check-bounds=yes --color=yes -e 'using InteractiveUtils; versioninfo(verbose=true); using Pkg; Pkg.build(); Pkg.test(coverage=true)'"
16+
17+
trigger:
18+
branch:
19+
- master
20+
21+
...

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
.drone.jsonnet linguist-detectable=false

.github/workflows/CompatHelper.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: CompatHelper
2+
on:
3+
schedule:
4+
- cron: 0 0 * * *
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Pkg.add("CompatHelper")
10+
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
11+
- name: CompatHelper.main()
12+
run: julia -e 'using CompatHelper; CompatHelper.main()'
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
15+
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/TagBot.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: TagBot
2+
on:
3+
issue_comment:
4+
types:
5+
- created
6+
workflow_dispatch:
7+
jobs:
8+
TagBot:
9+
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: JuliaRegistries/TagBot@v1
13+
with:
14+
token: ${{ secrets.GITHUB_TOKEN }}
15+
ssh: ${{ secrets.DOCUMENTER_KEY }}

.github/workflows/ci.yml

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches: "master"
6+
tags: ["*"]
7+
pull_request:
8+
release:
9+
10+
jobs:
11+
test:
12+
name: Julia ${{ join(matrix.*, ' - ') }} - ${{ github.event_name }}
13+
runs-on: ${{ matrix.os }}
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
julia-version:
18+
- "1.6"
19+
- "1"
20+
- "nightly"
21+
os:
22+
- ubuntu-latest
23+
- macos-latest
24+
- windows-latest
25+
julia-arch:
26+
- x64
27+
- x86
28+
include:
29+
- os: ubuntu-latest
30+
prefix: xvfb-run
31+
# 32-bit Julia binaries are not available on macOS
32+
exclude:
33+
- os: macOS-latest
34+
julia-arch: x86
35+
36+
steps:
37+
- uses: actions/checkout@v2
38+
- uses: julia-actions/setup-julia@v1
39+
with:
40+
version: ${{ matrix.julia-version }}
41+
arch: ${{ matrix.julia-arch }}
42+
- name: Cache artifacts
43+
uses: actions/cache@v2
44+
env:
45+
cache-name: cache-artifacts
46+
with:
47+
path: ~/.julia/artifacts
48+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
49+
restore-keys: |
50+
${{ runner.os }}-test-${{ env.cache-name }}-
51+
${{ runner.os }}-test-
52+
${{ runner.os }}-
53+
- uses: julia-actions/julia-buildpkg@latest
54+
- uses: julia-actions/julia-runtest@v1
55+
with:
56+
prefix: ${{ matrix.prefix }}
57+
- uses: julia-actions/julia-processcoverage@v1
58+
- uses: codecov/codecov-action@v1
59+
with:
60+
file: lcov.info
61+
- uses: coverallsapp/github-action@master
62+
with:
63+
github-token: ${{ secrets.github_token }}
64+
path-to-lcov: lcov.info
65+
flag-name: Julia ${{ join(matrix.*, ' - ') }}
66+
parallel: true
67+
68+
finish:
69+
needs: test
70+
if: ${{ always() }}
71+
runs-on: ubuntu-latest
72+
steps:
73+
- name: Coveralls Finished
74+
uses: coverallsapp/github-action@master
75+
with:
76+
github-token: ${{ secrets.github_token }}
77+
parallel-finished: true
78+
79+
Documentation:
80+
runs-on: ubuntu-latest
81+
steps:
82+
- uses: actions/checkout@v2
83+
- uses: julia-actions/setup-julia@latest
84+
with:
85+
version: 1
86+
- name: Cache artifacts
87+
uses: actions/cache@v2
88+
env:
89+
cache-name: cache-artifacts
90+
with:
91+
path: ~/.julia/artifacts
92+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/docs/Project.toml') }}
93+
restore-keys: |
94+
${{ runner.os }}-test-${{ env.cache-name }}-
95+
${{ runner.os }}-test-
96+
${{ runner.os }}-
97+
- uses: julia-actions/julia-docdeploy@v1
98+
with:
99+
prefix: xvfb-run
100+
env:
101+
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

.travis.yml

Lines changed: 0 additions & 57 deletions
This file was deleted.

Project.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "Gtk"
22
uuid = "4c0ca9eb-093a-5379-98c5-f87ac0bbbf44"
3-
version = "1.1.1"
3+
version = "1.3.0"
44

55
[deps]
66
Cairo = "159f3aea-2a34-519c-b102-8c37f9878175"
@@ -9,9 +9,12 @@ Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
99
GTK3_jll = "77ec8976-b24b-556a-a1bf-49a033a670a6"
1010
Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
1111
Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
12+
JLLWrappers = "692b3bcd-3c85-4b1f-b108-f13ce0eb3210"
1213
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
14+
Librsvg_jll = "925c91fb-5dd6-59dd-8e8c-345e74382d89"
1315
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
1416
Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
17+
Scratch = "6c6a2e73-6563-6170-7368-637461726353"
1518
Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
1619
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1720
Xorg_xkeyboard_config_jll = "33bec58e-1273-512f-9401-5d533626f822"
@@ -25,12 +28,14 @@ Cairo_jll = "1.16.0"
2528
GTK3_jll = "3.24.11"
2629
Glib_jll = "2.59.0"
2730
Graphics = "0.4, 1"
28-
Reexport = "0.2"
31+
JLLWrappers = "1.4.0"
32+
Reexport = "0.2, 1.0"
33+
Scratch = "1"
2934
Xorg_xkeyboard_config_jll = "2.27.0"
3035
adwaita_icon_theme_jll = "3.33.92"
3136
gdk_pixbuf_jll = "2.38.2"
3237
hicolor_icon_theme_jll = "0.17.0"
33-
julia = "1.3"
38+
julia = "1.6"
3439

3540
[extras]
3641
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
# Julia interface to `Gtk+ 2` and `Gtk+ 3` GUI library
1+
# Julia interface to `Gtk+ 3` GUI library
22

3-
[![Build Status](https://travis-ci.org/JuliaGraphics/Gtk.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphics/Gtk.jl)
4-
[![Build status](https://ci.appveyor.com/api/projects/status/yup46w98wv672sag?svg=true)](https://ci.appveyor.com/project/tknopp/gtk-jl)
3+
[![Project Status: Inactive – The project has reached a stable, usable state but is no longer being actively developed; support/maintenance will be provided as time allows.](https://www.repostatus.org/badges/latest/inactive.svg)](https://www.repostatus.org/#inactive)
4+
[![CI](https://github.com/JuliaGraphics/Gtk.jl/workflows/CI/badge.svg)](https://github.com/JuliaGraphics/Gtk.jl/actions?query=workflow%3ACI)
55
[![Coverage Status](https://coveralls.io/repos/JuliaGraphics/Gtk.jl/badge.svg)](https://coveralls.io/r/JuliaGraphics/Gtk.jl)
66
[![codecov.io](https://codecov.io/github/JuliaGraphics/Gtk.jl/coverage.svg?branch=master)](https://codecov.io/github/JuliaGraphics/Gtk.jl?branch=master)
77
[![](https://img.shields.io/badge/docs-latest-blue.svg)](https://juliagraphics.github.io/Gtk.jl/latest)
88

99
GUI building, using the Gtk library: [https://www.gtk.org/](https://www.gtk.org/)
1010

11-
Complete Gtk documentation is available at [https://developer.gnome.org/gtk/stable](https://developer.gnome.org/gtk/stable)
11+
Complete Gtk documentation is available at [https://www.gtk.org/docs](https://www.gtk.org/docs)
1212

1313
Documentation of this package can be found
1414
[here](https://juliagraphics.github.io/Gtk.jl/latest/).

appveyor.yml

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)