Skip to content

Commit

Permalink
- Update all non-major dependencies with digest and pinDigest (#492)
Browse files Browse the repository at this point in the history
* - Update all non-major dependencies with digest and pinDigest

* - fix

* - fix

---------

Co-authored-by: blumilk-renovate[bot] <177020257+blumilk-renovate[bot]@users.noreply.github.com>
Co-authored-by: EwelinaSkrzypacz <[email protected]>
  • Loading branch information
blumilk-renovate[bot] and EwelinaSkrzypacz authored Oct 1, 2024
1 parent 07afde8 commit eb82ad3
Show file tree
Hide file tree
Showing 16 changed files with 439 additions and 505 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-beta-manually.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: echo "BRANCH_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV

- name: checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
with:
fetch-depth: 0
ref: ${{ env.BRANCH_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
DOCKER_REGISTRY_REPO_NAME: toby
steps:
- name: checkout
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- name: set deployment project version
run: echo "DEPLOYMENT_PROJECT_VERSION=$(bash ./environment/prod/deployment/scripts/version.sh --long)" >> $GITHUB_ENV
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-lint-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- name: Cache dependencies
uses: actions/cache@0c45773b623bea8c8e75f6c82b208c3cf94ea4f9 # v4.0.2
Expand All @@ -33,7 +33,7 @@ jobs:
restore-keys: ${{ runner.os }}-npm-dependencies

- name: Set up node
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
node-version: 22.4.1

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-and-lint-php.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-22.04
services:
pgsql:
image: postgres:15@sha256:e600c23d564a5fc7824093c89b4c25dacb1cdd5de64e9e7ced0c630cfbcc1890
image: postgres:15@sha256:8e97b8526ed19304b144f7478bc9201646acf0723cdc100e9bb7495712cbadb6
env:
POSTGRES_DB: toby
POSTGRES_USER: toby
Expand All @@ -34,7 +34,7 @@ jobs:
- 5432:5432

steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0

- name: Validate composer.json and composer.lock
run: composer validate
Expand Down
6 changes: 5 additions & 1 deletion app/Http/Controllers/KeysController.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ public function index(Request $request): Response
{
$authUser = $request->user();
$keys = Key::query()
->whereRelation("user", fn(Builder $query): Builder => $query->withTrashed($authUser->canSeeInactiveUsers()))
->where(
fn(Builder $query): Builder => $query
->whereRelation("user", fn(Builder $query): Builder => $query->withTrashed($authUser->canSeeInactiveUsers()))
->orWhereNull("user_id"),
)
->with("user")
->get()
->sortBy("id");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public function toSlack(): SlackMessage
{
$url = route("vacation.requests.show", ["vacationRequest" => $this->vacationRequest->id]);
$seeDetails = __("See details");
$actions = [];

if ($this->vacationRequest->state->equals(WaitingForTechnical::class)) {
$actions = [
Expand Down
18 changes: 9 additions & 9 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,26 @@
"guzzlehttp/guzzle": "^7.9.2",
"inertiajs/inertia-laravel": "^1.3.0",
"laragear/cache-query": "^4.0.0",
"laravel/framework": "^11.21.0",
"laravel/framework": "^11.25.0",
"laravel/sanctum": "^4.0.2",
"laravel/socialite": "^5.15.1",
"laravel/socialite": "^5.16.0",
"laravel/telescope": "^5.2.2",
"laravel/tinker": "^2.9.0",
"maatwebsite/excel": "^3.1.56",
"laravel/tinker": "^2.10.0",
"maatwebsite/excel": "^3.1.58",
"phpoffice/phpword": "^1.3.0",
"sentry/sentry-laravel": "^4.8.0",
"sentry/sentry-laravel": "^4.9.0",
"spatie/laravel-google-calendar": "^3.8.0",
"spatie/laravel-model-states": "^2.7.1",
"spatie/laravel-model-states": "^2.7.2",
"spatie/laravel-permission": "^6.9.0",
"spatie/laravel-slack-slash-command": "^1.12.0"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.13.5",
"barryvdh/laravel-debugbar": "^3.14.2",
"blumilksoftware/codestyle": "^3.3.0",
"laravel/dusk": "^8.2.5",
"laravel/dusk": "^8.2.6",
"mockery/mockery": "^1.6.12",
"nunomaduro/collision": "^8.4.0",
"phpunit/phpunit": "^11.3.1",
"phpunit/phpunit": "^11.3.6",
"spatie/laravel-ignition": "^2.8.0"
},
"autoload": {
Expand Down
Loading

0 comments on commit eb82ad3

Please sign in to comment.