Skip to content

Commit

Permalink
Merge branch 'main' into fix/ldap-filtering
Browse files Browse the repository at this point in the history
# Conflicts:
#	CHANGELOG.md
  • Loading branch information
byewokko committed Sep 16, 2024
2 parents 192affe + 4e54524 commit 294b0f8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ jobs:
python-version: ["3.11", "3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -45,10 +45,10 @@ jobs:
python-version: ["3.11", "3.10"]

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

Expand All @@ -72,10 +72,10 @@ jobs:
if: ${{ github.event_name != 'pull_request' }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Docker Metadata action
uses: docker/metadata-action@v3
uses: docker/metadata-action@v5
id: meta
with:
images: teskalabs/seacat-auth
Expand All @@ -85,27 +85,27 @@ jobs:
type=semver,pattern={{raw}}
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USER }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v6
with:
context: .
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Create Docker Starter
uses: papeloto/action-zip@v1
uses: vimtor/action-zip@v1.2
with:
files: example/docker
dest: seacat-auth-docker-starter.zip

- name: Upload Docker Starter
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: seacat-auth-docker-starter
path: ${{ github.workspace }}/seacat-auth-docker-starter.zip
9 changes: 6 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,17 @@
## v24.36

### Pre-releases
- v24.36-alpha2
- v24.36-alpha4
- v24.36-alpha3
- ~~v24.36-alpha2~~
- v24.36-alpha1
- v24.29-alpha7
- v24.29-alpha6

### Fix
- Fix handling of empty filter in LDAP credentials provider (#421, `v24.36-alpha3`)
- Sort assigned tenants and roles alphabetically (#417, `v24.36-alpha2`)
- Fix handling of empty filter in LDAP credentials provider (#421, `v24.36-alpha4`)
- Upgrade CI/CD action versions (#418, `v24.36-alpha3`)
- Sort assigned tenants and roles alphabetically (#417, `v24.36-alpha3`)
- Do not check tenant existence when unassigning tenant (#415, `v24.29-alpha8`)
- Hotfix: Session expiration in userinfo must match access token expiration (#414, `v24.29-alpha7`)

Expand Down

0 comments on commit 294b0f8

Please sign in to comment.