diff options
| -rw-r--r-- | .woodpecker/publish.yaml | 5 | ||||
| -rw-r--r-- | .woodpecker/release.yaml | 4 | ||||
| -rw-r--r-- | doc/book/development/devenv.md | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.woodpecker/publish.yaml b/.woodpecker/publish.yaml index 38458264..7522d58d 100644 --- a/.woodpecker/publish.yaml +++ b/.woodpecker/publish.yaml @@ -20,8 +20,9 @@ steps: - name: multiarch-docker image: nixpkgs/nix:nixos-22.05 - secrets: - - docker_auth + environment: + DOCKER_AUTH: + from_secret: docker_auth commands: - mkdir -p /root/.docker - echo $DOCKER_AUTH > /root/.docker/config.json diff --git a/.woodpecker/release.yaml b/.woodpecker/release.yaml index baf81b0c..3f4a40a0 100644 --- a/.woodpecker/release.yaml +++ b/.woodpecker/release.yaml @@ -60,8 +60,8 @@ steps: environment: DOCKER_PLATFORM: "linux/${ARCH}" CONTAINER_NAME: "dxflrs/${ARCH}_garage" - secrets: - - docker_auth + DOCKER_AUTH: + from_secret: docker_auth commands: - mkdir -p /root/.docker - echo $DOCKER_AUTH > /root/.docker/config.json diff --git a/doc/book/development/devenv.md b/doc/book/development/devenv.md index 88f8ba06..518fd232 100644 --- a/doc/book/development/devenv.md +++ b/doc/book/development/devenv.md @@ -36,7 +36,7 @@ sudo killall nix-daemon Now you can enter our nix-shell, all the required packages will be downloaded but they will not pollute your environment outside of the shell: ```bash -nix-shell +nix-shell -A devShell ``` You can use the traditional Rust development workflow: @@ -65,8 +65,8 @@ nix-build -j $(nproc) --max-jobs auto ``` Our build has multiple parameters you might want to set: - - `release` build with release optimisations instead of debug - - `target allows` for cross compilation + - `release` to build with release optimisations instead of debug + - `target` allows for cross compilation - `compileMode` can be set to test or bench to build a unit test runner - `git_version` to inject the hash to display when running `garage stats` |