diff --git a/.woodpecker.yml b/.woodpecker.yml index 726f573..12ebf7c 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -21,6 +21,7 @@ pipeline: - yarn install - yarn run build + build-backend: image: chewingbever/fej-builder:latest pull: true @@ -50,7 +51,7 @@ pipeline: commands: - cargo fmt -- --check # This is run here because it requires compilation - - cargo clippy --all-targets -- -D warnings + - cargo clippy -- -D warnings # =====REBUILD & FLUSH CACHE===== @@ -62,7 +63,6 @@ pipeline: rebuild: true mount: - target - - .cargo - web/node_modules secrets: [ cache_s3_access_key, cache_s3_secret_key ] @@ -83,3 +83,26 @@ pipeline: # Push the cache, even on failure when: status: [ success, failure ] + + + # publish-builder: + # image: plugins/docker + # repo: chewingbever/fej-builder + # dockerfile: docker/Dockerfile.builder + # tag: [ latest ] + # secrets: [ docker_username, docker_password ] + # when: + # branch: develop + # event: push + + # Backend cicd jobs are disabled until we can figure out a way to cache stuff + # test-backend: + # image: chewingbever/fej-builder:latest + # # Always update the builder image + # pull: true + # commands: + # - cargo test + + # TODO build dev & rel image, deploy these images + +# branches: [ master, develop ] diff --git a/src/fej/ivago/street.rs b/src/fej/ivago/street.rs index 4ba45cb..2f30f06 100644 --- a/src/fej/ivago/street.rs +++ b/src/fej/ivago/street.rs @@ -18,7 +18,10 @@ impl Street { // This constructor just makes my life a bit easier during testing #[cfg(test)] fn new(name: String, city: String) -> Street { - Street { name, city } + Street { + name: name, + city: city, + } } }