Skip to content

Commit

Permalink
Merge branch 'master' into scala-steward-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
thanhz authored Feb 27, 2024
2 parents 013df1c + 8a0e6bc commit 1f8abae
Show file tree
Hide file tree
Showing 5 changed files with 140 additions and 26 deletions.
20 changes: 20 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
queue_rules:
- name: default
conditions:
- "check-success=test"
- "check-success=security/snyk (nationalarchives)"
pull_request_rules:
- name: automatic merge for Scala Steward
conditions:
- author=tna-digital-archiving-jenkins
- "check-success=test"
- "check-success=security/snyk (nationalarchives)"
- or:
- files=build.sbt
- files~=^(!?project/)
actions:
review:
type: APPROVE
message: Automatically approving Scala Steward
queue:
name: default
20 changes: 20 additions & 0 deletions .github/workflows/upsert-scala-steward-dependencies-branch.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Upsert `scala-steward-dependencies` branch

on:
push:
branches: master
jobs:
upsert-develop-branch:
permissions: write-all
runs-on: ubuntu-latest
name: Rebase `scala-steward-dependencies` branch to latest `origin/master`
steps:
- name: Checkout scala-steward-dependencies branch
uses: actions/checkout@v2
with:
ref: scala-steward-dependencies
fetch-depth: 0
- name: Rebase `scala-steward-dependencies` branch to latest `origin/master`
run: |
git rebase origin/master
git push -f -u origin scala-steward-dependencies
118 changes: 96 additions & 22 deletions ts/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nationalarchives/tdr-generated-graphql",
"version": "1.0.444",
"version": "1.0.446",
"description": "",
"main": "index.ts",
"scripts": {
Expand All @@ -25,10 +25,10 @@
"homepage": "https://github.com/nationalarchives/tdr-generated-graphql#readme",
"devDependencies": {
"@graphql-codegen/introspection": "^4.0.2",
"@graphql-codegen/typescript": "^4.0.1",
"@graphql-codegen/typescript": "^4.0.6",
"@graphql-codegen/typescript-document-nodes": "^4.0.4",
"@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
"@graphql-codegen/typescript-operations": "^4.0.1",
"@graphql-codegen/typescript-operations": "^4.2.0",
"ts-loader": "^9.3.0",
"typescript": "^5.3.3",
"webpack": "5.70.0",
Expand Down
2 changes: 1 addition & 1 deletion version.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ThisBuild / version := "0.0.362-SNAPSHOT"
ThisBuild / version := "0.0.364-SNAPSHOT"

0 comments on commit 1f8abae

Please sign in to comment.