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.

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

Release 5.4.4 -- Also push a {major} version tag (e.g. 6) #174

Merged
merged 6 commits into from
Oct 30, 2024
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
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
* @silinternational/developers
*.php @silinternational/php-devs
3 changes: 2 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

---

### Feature PR Checklist
### PR Checklist
- [ ] Put version number in PR title (e.g. `Release x.y.z - Summary of changes`)
- [ ] Documentation (README, etc.)
- [ ] Unit tests created or updated
- [ ] Run `make composershow`
4 changes: 3 additions & 1 deletion .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
name: Build and Publish
needs: tests
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags')
steps:
- name: Checkout code
uses: actions/checkout@v4
Expand Down Expand Up @@ -47,6 +48,7 @@ jobs:
type=ref,event=branch
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}

- name: Build and push Docker image to Docker Hub
uses: docker/build-push-action@v5
Expand All @@ -67,4 +69,4 @@ jobs:
ghcr.io/${{ github.repository }}:${{ github.ref_name }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
GITHUB_REF_NAME=${{ github.ref_name }}
GITHUB_REF_NAME=${{ github.ref_name }}
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ psr2:
docker compose run --rm cli bash -c "vendor/bin/php-cs-fixer fix ."

# NOTE: When running tests locally, make sure you don't exclude the integration
# tests (which we do when testing on Codeship).
# tests (which we do when testing on CI).
test: deps unittest broker behat

testci: deps broker
Expand Down
4 changes: 2 additions & 2 deletions actions-services.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ services:
EMAIL_SERVICE_baseUrl: http://email
EMAIL_SERVICE_validIpRanges: 192.168.0.0/16
ID_BROKER_ADAPTER: fake
ID_BROKER_CONFIG_accessToken: codeship-sync-to-broker-11111111
ID_BROKER_CONFIG_accessToken: ci-sync-to-broker-11111111
ID_STORE_ADAPTER: fake
IDP_NAME: Test

broker:
image: silintl/idp-id-broker:latest
environment:
APP_ENV: test
API_ACCESS_KEYS: codeship-sync-to-broker-11111111
API_ACCESS_KEYS: ci-sync-to-broker-11111111
EMAIL_SERVICE_accessToken: dummy
EMAIL_SERVICE_assertValidIp: "false"
EMAIL_SERVICE_baseUrl: http://email
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ protected function generateDummyPassword()
public function anActiveUserExists()
{
$newUser = $this->idBroker->createUser($this->testUserData);
Assert::assertTrue($newUser->getActive() === 'yes');
Assert::assertNotNull($newUser);
}

Expand Down