From bbc00edc6508ea1910c4d9e6a272f7859900950d Mon Sep 17 00:00:00 2001 From: seth Date: Fri, 16 Aug 2024 22:14:16 -0400 Subject: end of summer refactor (#31) * crates: `bot-*` -> `discord-bot` I didn't really need all these crates to be split :/ * discord-bot: revamp http impl also handles the new errors reported by teawieAPI * crates: split http backend this can be reused easily * git-tracker: short-circuit boolean logic We don't need to check if the commit is a descendant of the HEAD of the branch if it *is* the HEAD * nix: fenix -> nixpkgs * treefmt: add actionlint * nix: use docker arch names for containers * ci: use actions-rust-lang actions * nix: drop ci dev shell * git-tracker: init ManagedRepository this logic can be shared * ci: use nix for clippy scan * discord-bot: better handle unmerged PRs * ci: fix treefmt check * nix: fix clippy check * .env.template: update crate names * git-tracker: use remote name for remote name i was half asleep * discord-bot: handle merged PRs that aren't found in any tracked branches * git-tracker: make collect_statuses_in() return a Vec * discord-bot: add more PR info with response fixes #18 --- .github/workflows/docker.yaml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to '.github/workflows/docker.yaml') diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 4fba73a..efce40e 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,17 +5,19 @@ on: branches: [main] paths: - "**.nix" - - "flake.lock" - "**.rs" - - "Cargo.toml" + - ".github/workflows/docker.yaml" - "Cargo.lock" + - "Cargo.toml" + - "flake.lock" pull_request: paths: - "**.nix" - - "flake.lock" - "**.rs" - - "Cargo.toml" + - ".github/workflows/docker.yaml" - "Cargo.lock" + - "Cargo.toml" + - "flake.lock" workflow_dispatch: jobs: @@ -25,7 +27,7 @@ jobs: strategy: fail-fast: false matrix: - arch: [x86_64, arm64] + arch: [amd64, arm64] runs-on: ubuntu-latest @@ -111,7 +113,7 @@ jobs: env: TAG: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest run: | - architectures=("x86_64" "arm64") + architectures=("amd64" "arm64") for arch in "${architectures[@]}"; do docker load < images/container-"$arch"/*.tar.gz docker tag nixpkgs-tracker-bot:latest-"$arch" "$TAG"-"$arch" @@ -119,7 +121,7 @@ jobs: done docker manifest create "$TAG" \ - --amend "$TAG"-x86_64 \ + --amend "$TAG"-amd64 \ --amend "$TAG"-arm64 docker manifest push "$TAG" -- cgit v1.2.3