Skip to content

Commit

Permalink
ci: add static-folder
Browse files Browse the repository at this point in the history
  • Loading branch information
chesedo committed Nov 30, 2022
1 parent 28f93f3 commit b2cbab1
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ commands:
shuttle-persist = { path = "$PWD/resources/persist" }
shuttle-shared-db = { path = "$PWD/resources/shared-db" }
shuttle-secrets = { path = "$PWD/resources/secrets" }
shuttle-static-folder = { path = "$PWD/resources/static-folder }
EOF
install-rust:
steps:
Expand Down Expand Up @@ -260,6 +261,7 @@ workflows:
- resources/persist
- resources/secrets
- resources/shared-db
- resources/static-folder
- service-test:
requires:
- workspace-clippy
Expand Down
1 change: 1 addition & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ shuttle-aws-rds = { path = "[base]/shuttle/resources/aws-rds" }
shuttle-persist = { path = "[base]/shuttle/resources/persist" }
shuttle-shared-db = { path = "[base]/shuttle/resources/shared-db" }
shuttle-secrets = { path = "[base]/shuttle/resources/secrets" }
shuttle-static-folder = { path = "[base]/shuttle/resources/static-folder" }
```

Prime gateway database with an admin user:
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ publish: publish-resources publish-cargo-shuttle
publish-resources: publish-resources/aws-rds \
publish-resources/persist \
publish-resources/shared-db
publish-resources/static-folder

publish-cargo-shuttle: publish-resources/secrets
cd cargo-shuttle; cargo publish
Expand Down
3 changes: 2 additions & 1 deletion deployer/prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ shuttle-service = { path = "/usr/src/shuttle/service" }
shuttle-aws-rds = { path = "/usr/src/shuttle/resources/aws-rds" }
shuttle-persist = { path = "/usr/src/shuttle/resources/persist" }
shuttle-shared-db = { path = "/usr/src/shuttle/resources/shared-db" }
shuttle-secrets = { path = "/usr/src/shuttle/resources/secrets" }' > $CARGO_HOME/config.toml
shuttle-secrets = { path = "/usr/src/shuttle/resources/secrets" }
shuttle-static-folder = { path = "/usr/src/shuttle/resources/static-folder" }' > $CARGO_HOME/config.toml

# Prefetch crates.io index
cd /usr/src/shuttle/service
Expand Down
7 changes: 6 additions & 1 deletion e2e/tests/integration/helpers/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,17 @@ shuttle-service = {{ path = "{}" }}
shuttle-aws-rds = {{ path = "{}" }}
shuttle-persist = {{ path = "{}" }}
shuttle-shared-db = {{ path = "{}" }}
shuttle-secrets = {{ path = "{}" }}"#,
shuttle-secrets = {{ path = "{}" }}
shuttle-static-folder = {{ path = "{}" }}"#,
WORKSPACE_ROOT.join("service").display(),
WORKSPACE_ROOT.join("resources").join("aws-rds").display(),
WORKSPACE_ROOT.join("resources").join("persist").display(),
WORKSPACE_ROOT.join("resources").join("shared-db").display(),
WORKSPACE_ROOT.join("resources").join("secrets").display(),
WORKSPACE_ROOT
.join("resources")
.join("static-folder")
.display(),
)
.unwrap();

Expand Down

0 comments on commit b2cbab1

Please sign in to comment.