Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,10 @@ jobs:

conformance-suite:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
ssp-version: ["v2.3.7", "v2.4.2"]
env:
SUITE_BASE_URL: https://localhost.emobix.co.uk:8443
VERSION: release-v5.1.35
Expand Down Expand Up @@ -240,7 +244,7 @@ jobs:
working-directory: ./main
# Must run after conformance suite since they share a docker network.
run: |
OIDC_VERSION=@dev docker compose -f docker/docker-compose.yml --project-directory . up -d --build
SSP_VERSION=${{ matrix.ssp-version }} OIDC_VERSION=@dev docker compose -f docker/docker-compose.yml --project-directory . up -d --build
sleep 30
# while ! curl -skfail https://op.local.stack-dev.cirrusidentity.com/.well-known/openid-configuration >/dev/null; do sleep 2; done
- name: Run Basic conformance tests
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ during module development. SimpleSAMLphp has followed semantic versioning for it
for example, that v5.* of the OIDC module should work with any v2.* of SimpleSAMLphp. However, please note that
PHP version requirements have changed in minor SimpleSAMLphp releases.

| OIDC module | Tested SimpleSAMLphp | PHP | Note |
|:------------|:---------------------|:------:|-----------------------------|
| v6.\* | v2.3.\* | \>=8.2 | Recommended |
| v5.\* | v2.1.\* | \>=8.1 | |
| v4.\* | v2.0.\* | \>=8.0 | |
| v3.\* | v2.0.\* | \>=7.4 | Abandoned from August 2023. |
| v2.\* | v1.19.\* | \>=7.4 | |
| OIDC module | Tested SimpleSAMLphp | PHP | Note |
|:------------|:---------------------|:------:|-------------|
| v6.\* | v2.3.\*, v2.4.\* | \>=8.2 | Recommended |
| v5.\* | v2.1.\* | \>=8.1 | |
| v4.\* | v2.0.\* | \>=8.0 | |
| v3.\* | v2.0.\* | \>=7.4 | |
| v2.\* | v1.19.\* | \>=7.4 | |

### Upgrading?

Expand Down
5 changes: 3 additions & 2 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM cirrusid/simplesamlphp:v2.3.7
#FROM cicnavi/simplesamlphp:dev
ARG SSP_VERSION="v2.4.2"
FROM cirrusid/simplesamlphp:${SSP_VERSION}
#FROM cicnavi/simplesamlphp:${SSP_VERSION}

RUN apt-get update && apt-get install -y sqlite3
# Prepopulate the DB with items needed for testing
Expand Down
1 change: 1 addition & 0 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ services:
context: .
dockerfile: docker/Dockerfile
args:
SSP_VERSION: "${SSP_VERSION}"
OIDC_VERSION: "${OIDC_VERSION}"
environment:
- STAGINGCOMPOSERREPOS=oidc
Expand Down