Skip to content

Commit

Permalink
Merge pull request #331 from silinternational/release/6.7.1
Browse files Browse the repository at this point in the history
Release 6.7.1 -- better error, and auto-generate release string
  • Loading branch information
briskt authored Apr 5, 2024
2 parents c47210b + 9c8a8b7 commit 075517e
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 5 deletions.
3 changes: 0 additions & 3 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,3 @@
- [ ] Unit tests created or updated
- [ ] Run `make composershow`
- [ ] Run `make psr2`

### Release PR Checklist
- [ ] Update version number in main.php Sentry configuration
2 changes: 2 additions & 0 deletions .github/workflows/test-and-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,5 @@ jobs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
GITHUB_REF_NAME=${{ github.ref_name }}
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
FROM silintl/php8:8.1

ARG GITHUB_REF_NAME
ENV GITHUB_REF_NAME=$GITHUB_REF_NAME

ENV REFRESHED_AT 2024-02-27

RUN apt-get update -y && \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ AWS:
* `CONFIG_ID` - the configuration profile ID or name
* `ENV_ID` - the environment ID or name

In addition, the AWS PHP SDK requires authentication. It is best to use an access role
In addition, the AWS API requires authentication. It is best to use an access role
such as an [ECS Task Role](https://docs.aws.amazon.com/AmazonECS/latest/developerguide/task-iam-roles.html).
If that is not an option, you can specify an access token using the `AWS_ACCESS_KEY_ID` and
`AWS_SECRET_ACCESS_KEY` variables.
Expand Down
2 changes: 1 addition & 1 deletion application/common/config/main.php
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
'clientOptions' => [
'attach_stacktrace' => false, // stack trace identifies the logger call stack, not helpful
'environment' => YII_ENV,
'release' => 'idp-id-broker@6.7.0',
'release' => 'idp-id-broker@' . Env::get('GITHUB_REF_NAME', 'unknown'),
'max_request_body_size' => 'never', // never send request bodies
'before_send' => function (Event $event) use ($idpName): ?Event {
$event->setExtra(['idp' => $idpName]);
Expand Down
6 changes: 6 additions & 0 deletions application/frontend/controllers/MethodController.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,12 @@ public function actionCreate()
}

$userId = User::findOne(['employee_id' => $employeeId])->id ?? null;
if ($userId == null) {
throw new NotFoundHttpException(
'employee_id not found',
1540990165
);
}

return Method::findOrCreate($userId, $value);
}
Expand Down

0 comments on commit 075517e

Please sign in to comment.