Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Proper version names #347

Merged
merged 3 commits into from
Dec 23, 2024
Merged

Proper version names #347

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
647f7fc
Proper version names
mkysel Dec 20, 2024
7d15f60
no shortening
mkysel Dec 20, 2024
564bdc9
make consistent
mkysel Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-pre-baked-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-xmtpd.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ jobs:
echo "Unknown image: ${{ matrix.image }}"
exit 1
fi
- uses: benjlevesque/[email protected]
id: short-sha
- name: Build and push Docker image
uses: docker/build-push-action@v6
id: push
Expand All @@ -62,7 +64,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-${{ steps.short-sha.outputs.sha }}"

- name: Set xmtpd digest output
if: ${{ matrix.image == 'xmtpd' }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-from-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
build-args: "GIT_COMMIT=${{ github.ref_name }}-${{ github.event_name != 'pull_request' && github.sha || github.event.pull_request.head.sha }}"
2 changes: 1 addition & 1 deletion dev/run
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
go run -ldflags="-X main.Commit=dev-$(git rev-parse --short HEAD)" cmd/replication/main.go "$@"
2 changes: 1 addition & 1 deletion dev/run-2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"
go run -ldflags="-X main.Commit=dev-$(git rev-parse --short HEAD)" cmd/replication/main.go -p 5051 "$@"
Loading