Skip to content

Commit

Permalink
Merge branch 'master' into 9285-part14
Browse files Browse the repository at this point in the history
  • Loading branch information
chris48s authored Dec 4, 2023
2 parents 8447093 + 5d1ddbc commit e318a7a
Show file tree
Hide file tree
Showing 126 changed files with 2,387 additions and 1,936 deletions.
2 changes: 1 addition & 1 deletion .github/actions/docusaurus-swizzled-warning/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ inputs:
description: 'The GITHUB_TOKEN secret'
required: true
runs:
using: 'node16'
using: 'node20'
main: 'index.js'
213 changes: 107 additions & 106 deletions .github/actions/docusaurus-swizzled-warning/package-lock.json

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

4 changes: 2 additions & 2 deletions .github/actions/docusaurus-swizzled-warning/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"author": "jNullj",
"license": "CC0",
"dependencies": {
"@actions/core": "^1.10.0",
"@actions/github": "^5.1.1"
"@actions/core": "^1.10.1",
"@actions/github": "^6.0.0"
}
}
5 changes: 5 additions & 0 deletions .github/actions/service-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ inputs:
description: 'The SERVICETESTS_OBS_PASS secret'
required: false
default: ''
pepy-key:
description: 'The SERVICETESTS_PEPY_KEY secret'
required: false
default: ''
sl-insight-user-uuid:
description: 'The SERVICETESTS_SL_INSIGHT_USER_UUID secret'
required: false
Expand Down Expand Up @@ -66,6 +70,7 @@ runs:
LIBRARIESIO_TOKENS: '${{ inputs.librariesio-tokens }}'
OBS_USER: '${{ inputs.obs-user }}'
OBS_PASS: '${{ inputs.obs-pass }}'
PEPY_KEY: '${{ inputs.pepy-key }}'
SL_INSIGHT_USER_UUID: '${{ inputs.sl-insight-user-uuid }}'
SL_INSIGHT_API_TOKEN: '${{ inputs.sl-insight-api-token }}'
TWITCH_CLIENT_ID: '${{ inputs.twitch-client-id }}'
Expand Down
16 changes: 16 additions & 0 deletions .github/scripts/check-docusaurus-versions.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash

set -euo pipefail

# Docusaurus outputs some important errors as log messages
# but doesn't actually fail
# https://github.com/facebook/docusaurus/blob/v2.4.3/packages/docusaurus/src/server/siteMetadata.ts#L75-L92
# this script runs `docusaurus build`. If it outputs any [ERROR]s, we exit with 1

if ( npm run build 2>&1 | grep '\[ERROR\]' )
then
echo "You probably need to run: npm update @docusaurus/preset-classic"
exit 1
else
exit 0
fi
3 changes: 2 additions & 1 deletion .github/scripts/deploy-review-app.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ git checkout "pr-$PR_NUMBER"

# If the app does not already exist, create it
if ! flyctl status --app "$app"; then
flyctl launch --no-deploy --copy-config --name "$app" --region "$region" --org "$org"
flyctl launch --no-deploy --copy-config --name "$app" --region "$region" --org "$org" --dockerfile ./Dockerfile
echo $SECRETS | tr " " "\n" | flyctl secrets import --app "$app"
fi

# Deploy
flyctl deploy --app "$app" --region "$region"
flyctl scale count 1 --app "$app" --yes

# Post a comment on the PR
app_url=$(flyctl status --app "$app" --json | jq -r .Hostname)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ jobs:
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
with:
version: v0.9.1

- name: Set Git Short SHA
run: echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV

- name: Build
uses: docker/build-push-action@v4
uses: docker/build-push-action@v5
with:
context: .
push: false
Expand Down
Loading

0 comments on commit e318a7a

Please sign in to comment.