Merge branch 'main' into 681-integrate-backstage-readme-plugin

DiamondLightSource · Jun 28, 2024 · 517f470 · 517f470
2 parents 5466eb1 + 7d91baf
commit 517f470
Show file tree

Hide file tree

Showing 7 changed files with 1,053 additions and 1,087 deletions.
diff --git a/.github/workflows/code.yaml b/.github/workflows/code.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: Set node
         uses: actions/setup-node@v4.0.2
@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: Set node
         uses: actions/setup-node@v4.0.2
@@ -78,14 +78,14 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: Generate Image Name
         run: echo IMAGE_REPOSITORY=ghcr.io/$(tr '[:upper:]' '[:lower:]' <<< "${{ github.repository }}")-${{ matrix.target }} >> $GITHUB_ENV
 
       - name: Log in to GitHub Docker Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/.github/workflows/devcontainer.yaml b/.github/workflows/devcontainer.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3.3.0

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
         with:
           # Need this to get version number from last tag
           fetch-depth: 0
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
         with:
           # Need this to get version number from last tag
           fetch-depth: 0

diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.1.4
+        uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
 

diff --git a/backstage/packages/app/package.json b/backstage/packages/app/package.json
@@ -30,7 +30,7 @@
     "@backstage/plugin-catalog": "^1.15.1",
     "@backstage/plugin-catalog-common": "^1.0.18",
     "@backstage/plugin-catalog-graph": "^0.4.0",
-    "@backstage/plugin-catalog-import": "^0.10.3",
+    "@backstage/plugin-catalog-import": "^0.11.0",
     "@backstage/plugin-catalog-react": "^1.9.1",
     "@backstage/plugin-github-actions": "^0.6.8",
     "@backstage/plugin-home": "^0.7.2",

diff --git a/backstage/packages/backend/package.json b/backstage/packages/backend/package.json
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "@axis-backstage/plugin-readme-backend": "^0.6.0",
-    "@backstage/backend-common": "^0.21.2",
+    "@backstage/backend-common": "^0.22.0",
     "@backstage/backend-tasks": "^0.5.12",
     "@backstage/catalog-client": "^1.4.6",
     "@backstage/catalog-model": "^1.4.3",
@@ -40,7 +40,7 @@
     "@backstage/plugin-techdocs-backend": "^1.9.0",
     "@diamondlightsource/plugin-scaffolder-backend-module-copier": "^0.3.4",
     "@immobiliarelabs/backstage-plugin-gitlab-backend": "^6.0.0",
-    "better-sqlite3": "^9.0.0",
+    "better-sqlite3": "^11.0.0",
     "dockerode": "^4.0.0",
     "express": "^4.17.1",
     "express-promise-router": "^4.1.0",