Skip to content

Commit 7c0c20a

Browse files
jborean93jborean93
committed
Convert GitHub actions to YAML, adjust release
Converts the existing GitHub action files to YAML to reduce some of the quotes, lines, and support comments. Changes the release process to build the sdist first and then the wheels are built from that sdist. Also adds macOS wheels to the publishing process. Signed-off-by: Jordan Borean <[email protected]>
1 parent 7443358 commit 7c0c20a

File tree

5 files changed

+295
-355
lines changed

5 files changed

+295
-355
lines changed

‎.github/stale.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
{
2-
"daysUntilStale": 28,
3-
"daysUntilClose": 14,
4-
"staleLabel": "stale",
5-
"markComment": false,
6-
"only": "pulls",
7-
}
1+
# TODO: This is marked as deprecated - migrate to https://github.com/actions/stale
2+
# https://github.com/marketplace/actions/stale-for-actions
3+
daysUntilStale: 28
4+
daysUntilClose: 14
5+
staleLabel: stale
6+
markComment: 'false'
7+
only: pulls

‎.github/workflows/build.yml‎

Lines changed: 90 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,135 +1,93 @@
1-
{
2-
"name": "Build",
3-
"on": {
4-
"push": {
5-
"branches-ignore": "gh-pages",
6-
"tags-ignore": "*",
7-
},
8-
"pull_request": null,
9-
},
1+
name: Build
2+
on:
3+
push:
4+
branches-ignore: gh-pages
5+
tags-ignore: '*'
6+
pull_request: null
107

11-
"jobs": {
12-
"linux": {
13-
"runs-on": "ubuntu-latest",
14-
"strategy": {
15-
"fail-fast": false,
16-
"matrix": {
17-
"name": ["debian-stable", "debian-heimdal", "centos-8",
18-
"fedora-latest"],
19-
"include": [
20-
{
21-
"name": "debian-stable",
22-
"distro": "debian:stable",
23-
},
24-
{
25-
"name": "debian-heimdal",
26-
"distro": "debian:stable",
27-
"krb5_ver": "heimdal",
28-
},
29-
{
30-
"name": "centos-8",
31-
"distro": "centos:8",
32-
},
33-
{
34-
"name": "fedora-latest",
35-
"distro": "fedora:latest",
36-
"flake": "yes",
37-
},
38-
],
39-
},
40-
},
41-
"steps": [
42-
{
43-
"name": "Check out code",
44-
"uses": "actions/checkout@v2",
45-
},
46-
{
47-
"name": "Build and test gssapi",
48-
"run": "./ci/run-on-linux.sh ./ci/build.sh",
49-
"env": {
50-
"DISTRO": "${{ matrix.distro }}",
51-
"KRB5_VER": "${{ matrix.krb5_ver }}",
52-
"FLAKE": "${{ matrix.flake }}",
53-
},
54-
},
55-
],
56-
},
8+
jobs:
9+
linux:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
name:
15+
- debian-stable
16+
- debian-heimdal
17+
- centos-8
18+
- fedora-latest
19+
include:
20+
- name: debian-stable
21+
distro: debian:stable
22+
- name: debian-heimdal
23+
distro: debian:stable
24+
krb5_ver: heimdal
25+
- name: centos-8
26+
distro: centos:8
27+
- name: fedora-latest
28+
distro: fedora:latest
29+
flake: 'yes'
5730

58-
"windows": {
59-
"runs-on": "windows-latest",
60-
"strategy": {
61-
"fail-fast": false,
62-
"matrix": {
63-
"name": [
64-
"win-py-3.10",
65-
"win-py-3.9",
66-
"win-py-3.8",
67-
"win-py-3.7",
68-
"win-py-3.6",
69-
],
70-
"arch": [
71-
"x64",
72-
"x86"
73-
],
74-
"include": [
75-
{
76-
"name": "win-py-3.10",
77-
"pyenv": "3.10",
78-
},
79-
{
80-
"name": "win-py-3.9",
81-
"pyenv": "3.9",
82-
},
83-
{
84-
"name": "win-py-3.8",
85-
"pyenv": "3.8",
86-
},
87-
{
88-
"name": "win-py-3.7",
89-
"pyenv": "3.7",
90-
},
91-
{
92-
"name": "win-py-3.6",
93-
"pyenv": "3.6",
94-
},
95-
],
96-
},
97-
},
98-
"steps": [
99-
{
100-
"name": "Check out code",
101-
"uses": "actions/checkout@v2",
102-
},
103-
{
104-
"name": "Install the right python",
105-
"uses": "actions/setup-python@v2",
106-
"with": {
107-
"python-version": "${{ matrix.pyenv }}",
108-
"architecture": "${{ matrix.arch }}"
109-
},
110-
},
111-
{
112-
"name": "Build and test gssapi",
113-
"shell": "bash",
114-
"run": "./ci/build.sh",
115-
"env": { "OS_NAME": "windows" },
116-
},
117-
],
118-
},
31+
steps:
32+
- name: Check out code
33+
uses: actions/checkout@v2
11934

120-
"macos-heimdal": {
121-
"runs-on": "macos-latest",
122-
"steps": [
123-
{
124-
"name": "Check out code",
125-
"uses": "actions/checkout@v2",
126-
},
127-
{
128-
"name": "Build and test gssapi",
129-
"run": "./ci/build.sh",
130-
"env": { "KRB5_VER": "heimdal" },
131-
},
132-
],
133-
},
134-
},
135-
}
35+
- name: Build and test gssapi
36+
run: ./ci/run-on-linux.sh ./ci/build.sh
37+
env:
38+
DISTRO: ${{ matrix.distro }}
39+
KRB5_VER: ${{ matrix.krb5_ver }}
40+
FLAKE: ${{ matrix.flake }}
41+
42+
windows:
43+
runs-on: windows-latest
44+
strategy:
45+
fail-fast: false
46+
matrix:
47+
name:
48+
- win-py-3.10
49+
- win-py-3.9
50+
- win-py-3.8
51+
- win-py-3.7
52+
- win-py-3.6
53+
arch:
54+
- x64
55+
- x86
56+
include:
57+
- name: win-py-3.10
58+
pyenv: '3.10'
59+
- name: win-py-3.9
60+
pyenv: '3.9'
61+
- name: win-py-3.8
62+
pyenv: '3.8'
63+
- name: win-py-3.7
64+
pyenv: '3.7'
65+
- name: win-py-3.6
66+
pyenv: '3.6'
67+
68+
steps:
69+
- name: Check out code
70+
uses: actions/checkout@v2
71+
72+
- name: Install the right python
73+
uses: actions/setup-python@v2
74+
with:
75+
python-version: ${{ matrix.pyenv }}
76+
architecture: ${{ matrix.arch }}
77+
78+
- name: Build and test gssapi
79+
shell: bash
80+
run: ./ci/build.sh
81+
env:
82+
OS_NAME: windows
83+
84+
macos-heimdal:
85+
runs-on: macos-latest
86+
steps:
87+
- name: Check out code
88+
uses: actions/checkout@v2
89+
90+
- name: Build and test gssapi
91+
run: ./ci/build.sh
92+
env:
93+
KRB5_VER: heimdal

‎.github/workflows/deploy-docs.yml‎

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,24 @@
1-
{
2-
"name": "Deploy docs",
3-
"on": { "push": { "branches": "main" }},
4-
"jobs": {
5-
"update-pages": {
6-
"runs-on": "ubuntu-latest",
7-
"steps": [
8-
{
9-
"name": "Check out code",
10-
"uses": "actions/checkout@v2",
11-
},
12-
{
13-
"name": "Build docs",
14-
"env": { "DISTRO": "fedora:latest" },
15-
"run": "./ci/run-on-linux.sh ./ci/before-docs-deploy.sh",
16-
},
17-
{
18-
"name": "Deploy latest docs",
19-
"uses": "JamesIves/[email protected]",
20-
"with": {
21-
"GITHUB_TOKEN": "${{ secrets.GITHUB_TOKEN }}",
22-
"BRANCH": "gh-pages",
23-
"FOLDER": "ci_docs_build/html",
24-
"TARGET_FOLDER": "latest",
25-
},
26-
},
27-
],
28-
},
29-
},
30-
}
1+
name: Deploy docs
2+
on:
3+
push:
4+
branches: main
5+
6+
jobs:
7+
update-pages:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Check out code
11+
uses: actions/checkout@v2
12+
13+
- name: Build docs
14+
run: ./ci/run-on-linux.sh ./ci/before-docs-deploy.sh
15+
env:
16+
DISTRO: fedora:latest
17+
18+
- name: Deploy latest docs
19+
uses: JamesIves/[email protected]
20+
with:
21+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
22+
BRANCH: gh-pages
23+
FOLDER: ci_docs_build/html
24+
TARGET_FOLDER: latest

0 commit comments

Comments
 (0)