From 2bede822986380a3971c0cdf02fa85752565606b Mon Sep 17 00:00:00 2001 From: Manuel Holtgrewe Date: Mon, 19 Jun 2023 08:43:18 +0200 Subject: [PATCH] build: fix docker builds (#25) Release-As: 0.1.5 --- .github/workflows/docker-build.yml | 12 +++++----- .github/workflows/release-please.yml | 21 ++++++++++------ Cargo.lock | 36 ++++++++++++++-------------- Cargo.toml | 6 ++--- 4 files changed, 41 insertions(+), 34 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 0addf40..521a2f4 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -1,3 +1,9 @@ +# This workflow is run as part of CI to test that they run through. +# +# The images are pushed to `ghcr.io` for each PR and branch. The ones for +# the releases are pushed in `release-please.yml`. +name: Docker Build + on: push: branches: @@ -6,12 +12,6 @@ on: branches: - main -# This workflow is run as part of CI to test that they run through. -# -# The images are pushed to `ghcr.io` for each PR and branch. The ones for -# the releases are pushed in `release-please.yml`. -name: Docker Build - env: REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 918d6ab..9732203 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -1,24 +1,31 @@ +# Run `release-please` and build and release Docker image. +# +# This builds the containers with version tags. The `main` and `latest` tags are +# pushed in `docker-build.yml`. +name: Release Package/Image + on: push: branches: - main -# Run `release-please` and build and release Docker image. -# -# This builds the containers with version tags. The `main` and `latest` tags are -# pushed in `docker-build.yml`. -name: release-please +env: + REGISTRY: ghcr.io + PACKAGE_NAME: ${{ github.repository }} + IMAGE_NAME: ${{ github.repository }} jobs: release-please: if: github.repository_owner == 'bihealth' runs-on: ubuntu-latest + outputs: + release_created: ${{ steps.release.outputs.release_created }} steps: - - uses: GoogleCloudPlatform/release-please-action@v2 + - uses: GoogleCloudPlatform/release-please-action@v3 id: release with: release-type: rust - package-name: the-repo-name + package-name: ${{ env.PACKAGE_NAME}} - uses: actions/checkout@v3 if: ${{ steps.release.outputs.release_created }} diff --git a/Cargo.lock b/Cargo.lock index 12f1ac2..1ed2bdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -352,7 +352,7 @@ dependencies = [ "lazy_static", "lazycell", "peeking_take_while", - "prettyplease 0.2.6", + "prettyplease 0.2.8", "proc-macro2", "quote", "regex", @@ -485,9 +485,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.3.3" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8f255e4b8027970e78db75e78831229c9815fdbfa67eb1a1b777a62e24b4a0" +checksum = "80672091db20273a15cf9fdd4e47ed43b5091ec9841bf4c6145c9dfbbcae09ed" dependencies = [ "clap_builder", "clap_derive", @@ -506,9 +506,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.3.3" +version = "4.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd4f3c17c83b0ba34ffbc4f8bbd74f079413f747f84a6f89292f138057e36ab" +checksum = "c1458a1df40e1e2afebb7ab60ce55c1fa8f431146205aa5f4887e0b111c27636" dependencies = [ "anstream", "anstyle", @@ -579,9 +579,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e4c1eaa2012c47becbbad2ab175484c2a84d1185b566fb2cc5b8707343dfe58" +checksum = "03e69e28e9f7f77debdedbaafa2866e1de9ba56df55a8bd7cfc724c25a09987c" dependencies = [ "libc", ] @@ -1561,9 +1561,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.6" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b69d39aab54d069e7f2fe8cb970493e7834601ca2d8c65fd7bbd183578080d1" +checksum = "f2b0377b720bde721213a46cda1289b2f34abf0a436907cad91578c20de0454d" dependencies = [ "proc-macro2", "syn 2.0.18", @@ -1791,9 +1791,9 @@ dependencies = [ [[package]] name = "rocksdb-utils-lookup" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88297ce3b3630847791ea07297293bc111cd65db5a8cb9c575a227739e4e1ed8" +checksum = "d2689a1a506aeb888b493f7e2d8259dd659f7c3589d1694e0c8d328541c722ff" dependencies = [ "rocksdb", "thiserror", @@ -1884,9 +1884,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.96" +version = "1.0.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" +checksum = "bdf3bf93142acad5821c99197022e170842cdbc1c30482b98750c688c640842a" dependencies = [ "itoa", "ryu", @@ -2051,24 +2051,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "strum" -version = "0.24.1" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ "strum_macros", ] [[package]] name = "strum_macros" -version = "0.24.3" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59" +checksum = "fe9f3bd7d2e45dcc5e265fbb88d6513e4747d8ef9444cf01a533119bce28a157" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 1.0.109", + "syn 2.0.18", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 21f782a..bfedc17 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,13 +30,13 @@ prost = "0.11" rayon = "1.7" regex = "1.7" rocksdb = { version = "0.21", features = ["multi-threaded-cf"] } -rocksdb-utils-lookup = "0.1" +rocksdb-utils-lookup = "0.2" serde = { version = "1.0", features = ["serde_derive"] } serde_json = "1.0" serde_with = "3.0" shellexpand = "3.0" -strum = { version = "0.24", features = ["strum_macros", "derive"] } -strum_macros = "0.24" +strum = { version = "0.25", features = ["strum_macros", "derive"] } +strum_macros = "0.25" thiserror = "1.0" tracing = "0.1" tracing-subscriber = "0.3"