diff --git a/.github/workflows/build-pre-baked-images.yml b/.github/workflows/build-pre-baked-images.yml index 72e2776d..17ceb79c 100644 --- a/.github/workflows/build-pre-baked-images.yml +++ b/.github/workflows/build-pre-baked-images.yml @@ -9,7 +9,7 @@ on: jobs: push_to_registry: - name: Push Docker Image to GitHub Packages + name: Build pre-baked anvil-xmtpd runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/build-xmtpd.yml b/.github/workflows/build-xmtpd.yml index 2ff5e4ad..acaf1b1c 100644 --- a/.github/workflows/build-xmtpd.yml +++ b/.github/workflows/build-xmtpd.yml @@ -62,7 +62,7 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: "GIT_COMMIT=${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}" + build-args: "GIT_COMMIT=dev-${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}" - name: Set xmtpd digest output if: ${{ matrix.image == 'xmtpd' }} diff --git a/.github/workflows/release-from-tag.yml b/.github/workflows/release-from-tag.yml index cdc17526..2a7be429 100644 --- a/.github/workflows/release-from-tag.yml +++ b/.github/workflows/release-from-tag.yml @@ -55,4 +55,4 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - build-args: "GIT_COMMIT=${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}" \ No newline at end of file + build-args: "GIT_COMMIT=${{ github.ref_name }}-${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}" \ No newline at end of file diff --git a/dev/run b/dev/run index a9bd9279..fd3ded4c 100755 --- a/dev/run +++ b/dev/run @@ -8,4 +8,4 @@ export XMTPD_PAYER_ENABLE=true export XMTPD_REPLICATION_ENABLE=true export XMTPD_SYNC_ENABLE=true -go run -ldflags="-X main.Commit=$(git rev-parse HEAD)" cmd/replication/main.go "$@" \ No newline at end of file +go run -ldflags="-X main.Commit=dev-$(git rev-parse HEAD)" cmd/replication/main.go "$@" \ No newline at end of file diff --git a/dev/run-2 b/dev/run-2 index a2ea4e23..2c6a0ed2 100755 --- a/dev/run-2 +++ b/dev/run-2 @@ -12,4 +12,4 @@ export XMTPD_PAYER_ENABLE=true export XMTPD_REPLICATION_ENABLE=true export XMTPD_SYNC_ENABLE=true -go run -ldflags="-X main.Commit=$(git rev-parse HEAD)" cmd/replication/main.go -p 5051 "$@" \ No newline at end of file +go run -ldflags="-X main.Commit=dev-$(git rev-parse HEAD)" cmd/replication/main.go -p 5051 "$@" \ No newline at end of file