diff options
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/codespell.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/docker.yaml | 105 | ||||
| -rw-r--r-- | .github/workflows/installer.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/nix.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/rust.yml | 14 | ||||
| -rw-r--r-- | .github/workflows/shellcheck.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/update-nix-deps.yml | 2 |
7 files changed, 25 insertions, 108 deletions
diff --git a/.github/workflows/codespell.yml b/.github/workflows/codespell.yml index 5e8da009..7d941112 100644 --- a/.github/workflows/codespell.yml +++ b/.github/workflows/codespell.yml @@ -14,7 +14,7 @@ permissions: jobs: codespell: name: Check for spelling errors - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - name: Checkout diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index e7b3da6a..670bc2d5 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -5,72 +5,25 @@ on: branches: [main] jobs: - publish_x86: + publish: concurrency: - group: ${{ github.ref }}-x86 + group: ${{ github.ref }}-docker cancel-in-progress: true permissions: packages: write + contents: read + id-token: write - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 - with: - repository: atuinsh/atuin - path: "./" - name: Get Repo Owner id: get_repo_owner run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to container Registry - uses: docker/login-action@v3 - with: - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - - - name: Get short sha - id: shortsha - run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: Release build - id: release_build - uses: docker/build-push-action@v6 - with: - outputs: "type=registry,push=true" - platforms: linux/amd64 - file: ./Dockerfile - context: . - provenance: false - build-args: | - Version=dev - GitCommit=${{ steps.shortsha.outputs.short_sha }} - tags: | - ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 - - publish_aarch64: - concurrency: - group: ${{ github.ref }}-aarch64 - cancel-in-progress: true - permissions: - packages: write - - runs-on: ubuntu-24.04-arm - steps: - - uses: actions/checkout@v6 - with: - repository: atuinsh/atuin - path: "./" - - - name: Get Repo Owner - id: get_repo_owner - run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV + - uses: depot/setup-action@v1 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - name: Login to container Registry uses: docker/login-action@v3 with: @@ -82,12 +35,11 @@ jobs: id: shortsha run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Release build - id: release_build - uses: docker/build-push-action@v6 + - name: Build and push + uses: depot/build-push-action@v1 with: - outputs: "type=registry,push=true" - platforms: linux/arm64 + push: true + platforms: linux/amd64,linux/arm64 file: ./Dockerfile context: . provenance: false @@ -95,39 +47,4 @@ jobs: Version=dev GitCommit=${{ steps.shortsha.outputs.short_sha }} tags: | - ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 - - publish_manifest: - runs-on: ubuntu-latest - needs: [publish_x86, publish_aarch64] - steps: - - uses: actions/checkout@v6 - with: - repository: atuinsh/atuin - path: "./" - - - name: Get Repo Owner - id: get_repo_owner - run: echo "REPO_OWNER=$(echo ${{ github.repository_owner }} | tr '[:upper:]' '[:lower:]')" > $GITHUB_ENV - - - name: Login to container Registry - uses: docker/login-action@v3 - with: - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - - - name: Get short sha - id: shortsha - run: echo "short_sha=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - - name: Create manifest - run: | - docker manifest create ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} \ - --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 \ - --amend ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 - docker manifest annotate --arch amd64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-amd64 - docker manifest annotate --arch arm64 --os linux ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }}-aarch64 - docker manifest inspect ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} - - docker manifest push ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} + ghcr.io/${{ env.REPO_OWNER }}/atuin:${{ steps.shortsha.outputs.short_sha }} diff --git a/.github/workflows/installer.yml b/.github/workflows/installer.yml index 33fbe50d..2cc4f89f 100644 --- a/.github/workflows/installer.yml +++ b/.github/workflows/installer.yml @@ -13,14 +13,14 @@ jobs: install: strategy: matrix: - os: [ubuntu-latest, macos-14] + os: [depot-ubuntu-24.04, macos-14] runs-on: ${{ matrix.os }} steps: - uses: actions/checkout@v6 - name: Install zsh for ubuntu - if: matrix.os == 'ubuntu-latest' + if: matrix.os == 'depot-ubuntu-24.04' run: | sudo apt install zsh diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index b148d979..515a05eb 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -14,7 +14,7 @@ on: jobs: check: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -24,7 +24,7 @@ jobs: run: nix flake check --print-build-logs build-test: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b996c582..a215888f 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -17,7 +17,7 @@ jobs: build: strategy: matrix: - os: [ubuntu-latest, macos-14, windows-latest] + os: [depot-ubuntu-24.04, macos-14, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -55,7 +55,7 @@ jobs: # # warning: libelf.so.2, needed by <...>/libkvm.so, not found (try using -rpath or -rpath-link) target: [x86_64-unknown-illumos] - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -88,7 +88,7 @@ jobs: unit-test: strategy: matrix: - os: [ubuntu-latest, macos-14, windows-latest] + os: [depot-ubuntu-24.04, macos-14, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -118,7 +118,7 @@ jobs: check: strategy: matrix: - os: [ubuntu-latest, macos-14, windows-latest] + os: [depot-ubuntu-24.04, macos-14, windows-latest] runs-on: ${{ matrix.os }} steps: @@ -153,7 +153,7 @@ jobs: run: cargo check --no-default-features --features client --workspace integration-test: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 services: postgres: @@ -192,7 +192,7 @@ jobs: ATUIN_DB_URI: postgres://atuin:pass@localhost:5432/atuin clippy: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 @@ -215,7 +215,7 @@ jobs: run: cargo clippy -- -D warnings -D clippy::redundant_clone format: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/shellcheck.yml b/.github/workflows/shellcheck.yml index 7c983232..e85381fd 100644 --- a/.github/workflows/shellcheck.yml +++ b/.github/workflows/shellcheck.yml @@ -8,7 +8,7 @@ on: jobs: shellcheck: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 steps: - uses: actions/checkout@v6 diff --git a/.github/workflows/update-nix-deps.yml b/.github/workflows/update-nix-deps.yml index 8c43e549..2ed5ff78 100644 --- a/.github/workflows/update-nix-deps.yml +++ b/.github/workflows/update-nix-deps.yml @@ -6,7 +6,7 @@ on: jobs: lockfile: - runs-on: ubuntu-latest + runs-on: depot-ubuntu-24.04 if: github.repository == 'atuinsh/atuin' steps: - name: Checkout repository |
