Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tests to run wth current setups #229

Merged
merged 5 commits into from
Nov 13, 2020
Merged

Fix tests to run wth current setups #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
718e194
Fix Cython warning about inline converter declarations
frozencemetery Nov 11, 2020
743af8e
Drop test dependency on should_be
stanislavlevin Nov 12, 2020
842017b
Fix S4U tests
frozencemetery Nov 12, 2020
4b4d096
Upgrade CI Fedora version to latest
frozencemetery Nov 12, 2020
93ce057
Fix setting hostname in container in CI
frozencemetery Nov 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 8 additions & 5 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,15 @@
"jobs": {
"linux": {
"runs-on": "ubuntu-latest",
"container": {
"image": "${{ matrix.distro }}",
"options": "-htest.box",
},
"strategy": {
"fail-fast": false,
"matrix": {
"name": ["debian-stable", "debian-heimdal", "centos-8",
"fedora-31"],
"fedora-latest"],
"include": [
{
"name": "debian-stable",
Expand All @@ -31,8 +35,8 @@
"distro": "centos:8",
},
{
"name": "fedora-31",
"distro": "fedora:31",
"name": "fedora-latest",
"distro": "fedora:latest",
"flake": "yes",
},
],
Expand All @@ -45,9 +49,8 @@
},
{
"name": "Build and test gssapi",
"run": "./ci/run-on-linux.sh ./ci/build.sh",
"run": "./ci/build.sh",
"env": {
"DISTRO": "${{ matrix.distro }}",
"KRB5_VER": "${{ matrix.krb5_ver }}",
"FLAKE": "${{ matrix.flake }}",
},
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy-docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
"jobs": {
"update-pages": {
"runs-on": "ubuntu-latest",
"container": "fedora-latest",
"steps": [
{
"name": "Check out code",
"uses": "actions/checkout@v2",
},
{
"name": "Build docs",
"run": "./ci/run-on-linux.sh ./ci/before-docs-deploy.sh",
"env": { "DISTRO": "fedora:31" },
"run": "./ci/before-docs-deploy.sh",
},
{
"name": "Deploy latest docs",
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,18 @@
"jobs": {
"release-linux": {
"runs-on": "ubuntu-latest",
"container": {
"image": "fedora:latest",
"options": "-htest.box",
},
"steps": [
{
"name": "Check out code",
"uses": "actions/checkout@v2",
},
{
"name": "Set things up",
"run": "./ci/run-on-linux.sh ./ci/before-deploy.sh",
"env": { "DISTRO": "fedora:31" },
"run": "./ci/before-deploy.sh",
},
{
"name": "Deploy to PyPI",
Expand Down
2 changes: 0 additions & 2 deletions README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ For Running the Tests

* the `nose` package

* the `shouldbe` package

* the `k5test` package

To install test dependencies using pip:
Expand Down
14 changes: 0 additions & 14 deletions ci/run-on-linux.sh
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gssapi/raw/cython_converters.pxd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ from gssapi.raw.types import MechType, NameType


cdef gss_OID_set c_get_mech_oid_set(object mechs)
cdef inline bint c_compare_oids(gss_OID a, gss_OID b)
cdef bint c_compare_oids(gss_OID a, gss_OID b)
cdef object c_create_oid_set(gss_OID_set mech_set, bint free=*)
cdef OID c_make_oid(gss_OID oid)

Expand Down