Skip to content

Commit 741838a

Browse files
authored
Merge branch 'master' into dependabot/docker/node-25-bullseye
2 parents 5812e9a + 376173a commit 741838a

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

.github/workflows/on_call_build_site.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,10 @@ jobs:
3030
password: ${{ github.token }}
3131

3232
- name: Build base image
33+
env:
34+
push_tag: ${{inputs.push_tag || 'temp' }}
3335
run: |
34-
docker build --target base -t ghcr.io/orionrobots/orionrobots-site.base:${{ inputs.push_tag || 'temp' }} .
36+
docker build --target base -t "ghcr.io/orionrobots/orionrobots-site.base:${push_tag}" .
3537
3638
- name: Build the site with docker compose
3739
run: |
@@ -42,20 +44,22 @@ jobs:
4244
tar -czf _site.tar.gz _site
4345
4446
- name: upload site artifact
45-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
47+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
4648
with:
4749
name: _site
4850
path: _site.tar.gz
4951
if-no-files-found: error
5052

5153
- name: upload httpd.conf artifact
52-
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
54+
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
5355
with:
5456
name: httpd.conf
5557
path: .github/scripts/staging/httpd.conf
5658
if-no-files-found: error
5759

5860
- name: Push base image
5961
if: inputs.push_tag
62+
env:
63+
push_tag: ${{inputs.push_tag }}
6064
run: |
61-
docker push ghcr.io/orionrobots/orionrobots-site.base:${{ inputs.push_tag }}
65+
docker push "ghcr.io/orionrobots/orionrobots-site.base:${push_tag}"

.github/workflows/on_call_staging_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v5
1616
- name: Fetch site artifact
17-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
17+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
1818
with:
1919
name: _site
2020
- name: extract site artifact

.github/workflows/on_push_to_master_test_and_deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
needs: staging_test
5050
steps:
5151
- name: Fetch site artifact
52-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
52+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
5353
with:
5454
name: _site
5555

@@ -58,7 +58,7 @@ jobs:
5858
tar -xzf _site.tar.gz
5959
6060
- name: Fetch httpd conf artifact
61-
uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
61+
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
6262
with:
6363
name: httpd.conf
6464
path: .github/scripts/staging/httpd.conf

package-lock.json

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"markdown-it-attrs": "^4.3.1",
4545
"mini-css-extract-plugin": "^2.9.1",
4646
"moment": "^2.30.1",
47-
"playwright": "^1.55.0",
47+
"playwright": "^1.56.1",
4848
"postcss-loader": "^8.1.1",
4949
"sass": "^1.89.1",
5050
"sass-loader": "^16.0.2",

0 commit comments

Comments
 (0)