Skip to content

Deployment updates #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2022
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ _steps:
install_aws_cli: &install_aws_cli
run: sudo apt-get update && sudo apt-get install awscli
install_dependencies: &install_dependencies
run: npm ci --cache .npm-cache && sudo npm config set @microbit-foundation:registry https://npm.pkg.github.com/microbit-foundation && sudo npm i -g @microbit-foundation/[email protected] @microbit-foundation/website-deploy-aws-config@0.4.2 @microbit-foundation/circleci-npm-package-versioner@1
run: npm ci --cache .npm-cache && sudo npm config set @microbit-foundation:registry https://npm.pkg.github.com/microbit-foundation && sudo npm i -g @microbit-foundation/[email protected] @microbit-foundation/website-deploy-aws-config@0.5.0-dev.94 @microbit-foundation/circleci-npm-package-versioner@1
install_theme: &install_theme
run: npm config set @microbit-foundation:registry https://npm.pkg.github.com/microbit-foundation && npm install --no-save @microbit-foundation/[email protected]
update_version: &update_version
Expand Down
8 changes: 1 addition & 7 deletions bin/public-url.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,5 @@
*
* SPDX-License-Identifier: MIT
*/
const {
createDeploymentDetailsWithReviewPrefixes,
} = require("@microbit-foundation/website-deploy-aws-config");

const {
s3Config: { bucketPrefix },
} = createDeploymentDetailsWithReviewPrefixes();
const { bucketPrefix } = require("../deployment");
console.log(`/${bucketPrefix}/`);
18 changes: 16 additions & 2 deletions deployment.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,24 @@
* SPDX-License-Identifier: MIT
*/
const {
createDeploymentDetailsWithReviewPrefixes,
createDeploymentDetailsFromOptions,
} = require("@microbit-foundation/website-deploy-aws-config");

const { s3Config } = createDeploymentDetailsWithReviewPrefixes();
const { s3Config } = createDeploymentDetailsFromOptions({
production: {
bucket: "python-editor-v3.microbit.org",
mode: "major",
allowPrerelease: true,
},
staging: {
bucket: "stage-python-editor-v3.microbit.org",
prefix: "v/beta",
},
review: {
bucket: "review-python-editor-v3.microbit.org",
mode: "branch-prefix",
},
});
module.exports = {
...s3Config,
region: "eu-west-1",
Expand Down