Skip to content

Commit 8e8b02f

Browse files
authored
Merge branch 'scala-steward-dependencies' into update/scala-steward-dependencies/all
2 parents c57c15d + 54f3a72 commit 8e8b02f

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
- closed
66
jobs:
77
pre-deploy:
8-
uses: nationalarchives/tdr-github-actions/.github/workflows/lambda_build.yml@5d4fee21ed08f053613a7706e28623c0adc0f5f4 # v0.0.10
8+
uses: nationalarchives/tdr-github-actions/.github/workflows/lambda_build.yml@cd362ffa9386c007c816bfd15a25b6f0a3c3b3d6 # v0.0.14
99
if: ${{ github.base_ref == 'master' && github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'Version bump') }}
1010
with:
1111
lambda-name: database-migrations
@@ -23,7 +23,7 @@ jobs:
2323
needs: pre-deploy
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2727
- run: gh workflow run deploy.yml -f environment=intg -f to-deploy=${{ needs.pre-deploy.outputs.next-version }}
2828
env:
2929
GITHUB_TOKEN: ${{ secrets.WORKFLOW_PAT }}

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
contents: write
2222
jobs:
2323
deploy:
24-
uses: nationalarchives/tdr-github-actions/.github/workflows/lambda_deploy.yml@5d4fee21ed08f053613a7706e28623c0adc0f5f4 # v0.0.10
24+
uses: nationalarchives/tdr-github-actions/.github/workflows/lambda_deploy.yml@cd362ffa9386c007c816bfd15a25b6f0a3c3b3d6 # v0.0.14
2525
with:
2626
lambda-name: database-migrations
2727
deployment-package: db-migrations.jar
@@ -36,7 +36,7 @@ jobs:
3636
needs: deploy
3737
runs-on: ubuntu-latest
3838
steps:
39-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
39+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4040
- run: gh workflow run run.yml -f environment=${{inputs.environment}}
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.WORKFLOW_PAT }}

.github/workflows/publish.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
ports:
2222
- 5432:5432
2323
steps:
24-
- uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
25-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
26-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
24+
- uses: sbt/setup-sbt@a627500d27445f8c5021755a439829b6e78e3358 # v1.1.15
25+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
26+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2727
with:
2828
java-version: 17
2929
distribution: 'temurin'
@@ -52,7 +52,7 @@ jobs:
5252
env:
5353
GITHUB_TOKEN: ${{ secrets.WORKFLOW_PAT }}
5454
- name: Send success message
55-
uses: nationalarchives/tdr-github-actions/.github/actions/slack-send@5d4fee21ed08f053613a7706e28623c0adc0f5f4
55+
uses: nationalarchives/tdr-github-actions/.github/actions/slack-send@cd362ffa9386c007c816bfd15a25b6f0a3c3b3d6
5656
with:
5757
message: "*Database schema* :arrow_up: The database package has been published"
5858
slack-url: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/run.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
runs-on: ubuntu-latest
2323
steps:
2424
- name: Checkout
25-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
25+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2626
- id: role-name
2727
run: |
2828
import os

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,18 @@ jobs:
2020
ports:
2121
- 5432:5432
2222
steps:
23-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
24-
- uses: sbt/setup-sbt@3e125ece5c3e5248e18da9ed8d2cce3d335ec8dd # v1.1.14
23+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
24+
- uses: sbt/setup-sbt@a627500d27445f8c5021755a439829b6e78e3358 # v1.1.15
2525
with:
2626
ref: 'master'
27-
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
27+
- uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5.2.0
2828
with:
2929
java-version: 17
3030
distribution: 'temurin'
3131
- name: Create migrations user
3232
run: PGPASSWORD=password psql -U tdr -h localhost -d consignmentapi -f .github/scripts/create-user.sql
3333
- name: Run migrate for master
3434
run: sbt flywayMigrate
35-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
35+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3636
- name: Test
3737
run: sbt flywayMigrate
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INSERT INTO "Body" ("BodyId", "Name", "Description", "TdrCode") VALUES
2+
(uuid_generate_v4(), 'Medicines and Healthcare products Regulatory Agency', 'Medicines and Healthcare products Regulatory Agency', 'TDR-MHRA');
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
INSERT INTO "ConsignmentProperty" ("Name", "Description")
2+
VALUES ('LegalStatus', '' )

0 commit comments

Comments
 (0)