Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,7 @@ env:
# renovate: datasource=npm depName=@microbit-foundation/python-editor-v3-microbit registryUrl=https://npm.pkg.github.com
THEME_VERSION: 0.4.0
# renovate: datasource=npm depName=@microbit-foundation/website-deploy-aws registryUrl=https://npm.pkg.github.com
DEPLOY_AWS_VERSION: "0.6.0"
# renovate: datasource=npm depName=@microbit-foundation/website-deploy-aws-config registryUrl=https://npm.pkg.github.com
DEPLOY_AWS_CONFIG_VERSION: "0.10.1"
DEPLOY_AWS_VERSION: "1.0.1"

jobs:
build:
Expand Down Expand Up @@ -51,7 +49,7 @@ jobs:
- run: npm ci
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@${{ env.THEME_VERSION }} @microbit-foundation/website-deploy-aws@${{ env.DEPLOY_AWS_VERSION }} @microbit-foundation/website-deploy-aws-config@${{ env.DEPLOY_AWS_CONFIG_VERSION }}
- run: npm install --no-save @microbit-foundation/python-editor-v3-microbit@${{ env.THEME_VERSION }} @microbit-foundation/website-deploy-aws@${{ env.DEPLOY_AWS_VERSION }}
if: github.repository_owner == 'microbit-foundation'
env:
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -80,6 +78,9 @@ jobs:
env:
AWS_ACCESS_KEY_ID: ${{ secrets.WEB_DEPLOY_AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.WEB_DEPLOY_AWS_SECRET_ACCESS_KEY }}
# Set to 1 for one deploy after changing params in deployment.js,
# as unchanged files are otherwise skipped.
WEBSITE_DEPLOY_FORCE: 0
- run: npm run invalidate
if: github.repository_owner == 'microbit-foundation' && (env.STAGE == 'REVIEW' || success())
env:
Expand Down
4 changes: 1 addition & 3 deletions deployment.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
const {
createDeploymentDetailsFromOptions,
} = require("@microbit-foundation/website-deploy-aws-config");
} = require("@microbit-foundation/website-deploy-aws");

const { s3Config } = createDeploymentDetailsFromOptions({
production: {
Expand All @@ -26,8 +26,6 @@ module.exports = {
...s3Config,
region: "eu-west-1",
removeNonexistentObjects: true,
enableS3StaticWebsiteHosting: true,
errorDocumentKey: "index.html",
redirects: [],
params: {
"**/**.html": {
Expand Down
Loading