Skip to content

Commit df0d815

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/webpack-5.102.1
2 parents 393ba73 + fc96abd commit df0d815

File tree

10 files changed

+59
-39
lines changed

10 files changed

+59
-39
lines changed

.github/scripts/new_post.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
set -eu -o pipefail
77

8-
98
function slug_from_title_and_date {
109
echo "$POST_DAY-$1" | tr '[:upper:]' '[:lower:]' | tr -s ' ' '-' | tr -s '[:punct:]' '-'
1110
}

.github/workflows/on_call_build_site.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,23 @@ jobs:
1717
DOCKER_BUILDKIT: 1
1818
COMPOSE_DOCKER_CLI_BUILD: 1
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
2121

2222
- name: Set up Docker Buildx
2323
uses: docker/setup-buildx-action@v3
2424

2525
- name: Login to Docker
26-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
26+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2727
with:
2828
registry: ghcr.io
2929
username: ${{ github.actor }}
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: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@ 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
2121
run: |
2222
tar -xzf _site.tar.gz
2323
2424
- name: Set up Docker Buildx
25-
uses: docker/setup-buildx-action@v3
25+
uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
2626

2727
- name: Login to Docker
28-
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3
28+
uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
2929
with:
3030
registry: ghcr.io
3131
username: ${{ github.actor }}
@@ -54,8 +54,8 @@ jobs:
5454
curl -I -f http://localhost:8080/wiki/lego || exit_code=1
5555
5656
# Run BDD integration tests using docker compose
57-
echo "## BDD Test Results" >> $GITHUB_STEP_SUMMARY
58-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
57+
echo "## BDD Test Results" >> "$GITHUB_STEP_SUMMARY"
58+
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
5959
docker compose -f docker-compose.yml -f docker-compose.ci.yml run test 2>&1 | tee bdd_output.txt
6060
bdd_result=$?
6161
@@ -64,13 +64,13 @@ jobs:
6464
awk '
6565
/^> orionrobots\.github\.io@/ { found=1 }
6666
found { print }
67-
' bdd_output.txt >> $GITHUB_STEP_SUMMARY
68-
echo "\`\`\`" >> $GITHUB_STEP_SUMMARY
67+
' bdd_output.txt >> "$GITHUB_STEP_SUMMARY"
68+
echo "\`\`\`" >> "$GITHUB_STEP_SUMMARY"
6969
7070
if [ $bdd_result -eq 0 ]; then
71-
echo "✅ BDD tests passed" >> $GITHUB_STEP_SUMMARY
71+
echo "✅ BDD tests passed" >> "$GITHUB_STEP_SUMMARY"
7272
else
73-
echo "❌ BDD tests failed" >> $GITHUB_STEP_SUMMARY
73+
echo "❌ BDD tests failed" >> "$GITHUB_STEP_SUMMARY"
7474
exit_code=1
7575
fi
7676

.github/workflows/on_pr_lint.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@ jobs:
2828
runs-on: ubuntu-latest
2929
steps:
3030
- name: Checkout source code
31-
uses: actions/checkout@v5
31+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3232

3333
- name: Lint Code Base
3434
continue-on-error: true
35-
uses: oxsecurity/megalinter/flavors/cupcake@v9.0.1
35+
uses: oxsecurity/megalinter/flavors/cupcake@v9.1.0
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/on_push_to_master_test_and_deploy.yaml

Lines changed: 4 additions & 5 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
@@ -88,16 +88,15 @@ jobs:
8888
- uses: actions/checkout@v5
8989

9090
- name: Check for workflow changes
91-
# tj-actions/changed-files v44.5.7
92-
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62
91+
uses: tj-actions/changed-files@24d32ffd492484c1d75e0c0b894501ddb9d30d62 # v47.0.0
9392
id: filter
9493
with:
9594
files: |
9695
.github/workflows/**
9796
9897
# see https://github.com/mcdeck/netlify-cms-oauth-provider-php
9998
- name: Checkout the netlify-cms-oauth-provider-php
100-
uses: actions/checkout@v5
99+
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
101100
with:
102101
repository: mcdeck/netlify-cms-oauth-provider-php
103102
path: netlify-cms-oauth-provider-php

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Development build - minimal context needed since content is volume-mounted
2-
FROM node:24-bullseye AS base
2+
FROM node:25-bullseye AS base
33

44
# Create app directory
55
WORKDIR /app/src
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
title: Worlds undiscovered
3+
date: 2025-09-11
4+
tags:
5+
- Exploration
6+
- Learning
7+
- Discovery
8+
- Robot building
9+
---
10+
I still hear phrases like "ruining the magic" when it comes to understanding how stuff like technology, natural processes or cosmic phenomena work. However, I've a different take on this.
11+
12+
When you understand how some bit of tech works (for example, a mobile phone screen), then sure that no longer feels like magic.
13+
14+
But there's a new awe that comes, "now I know how to make one, or integrate one, or how that thing works, what else might I do with it". Ideas may start to flood in, you may start to recognise the principles elsewhere, and the more you have learned, the more this happens. This continuous personal revelation can be pretty motivating and inspiring. The "Oh!" moments as stuff starts to slot in. The bit where that one tiny bit of maths that escaped you suddenly clicks, and a whole group of other conjectures come from it, which maybe lead you to understand concepts that never quite made sense before.
15+
16+
There's a phrase that I used to describe programming, but it pretty much describes any realm of exploration and discovery, that there are always "Worlds undiscovered" - new ways to use what you now know, new things to build from the blocks you have, or from the parts in those blocks you can now see, or places to discover from the place you had. And it might be just that tiny incremental bit of understanding, on the edge of your grasp from where you are now - it need not be an arctic trek.
17+
18+
Keep exploring - be it worlds, places, technology, maths, philosophy, science - there are always Worlds Undiscovered!

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Minimal development Dockerfile
22
# Only installs npm dependencies since content is volume-mounted
3-
FROM node:24-bullseye AS base
3+
FROM node:25-bullseye AS base
44

55
# Create app directory
66
WORKDIR /app/src

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
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",
49-
"sass": "^1.89.1",
49+
"sass": "^1.93.3",
5050
"sass-loader": "^16.0.2",
5151
"slugify": "^1.6.6",
5252
"source-map-loader": "^5.0.0",

0 commit comments

Comments
 (0)