mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 21:12:48 +01:00
f72650d2de
## Issue being fixed or feature implemented Client version string is inconsistent. Building `v20.0.0-beta.8` tag locally produces binaries that report `v20.0.0-beta.8` version but binaries built in guix would report `v20.0.0rc1-g3e732a952226a20505f907e4fd9b3fdbb14ea5ee` instead. Building any commit after `v20.0.0-beta.8` locally would result in versions like `v20.0.0rc1-8c94153d2497` which is close but it's still yet another format. And both versions with `rc1` in their names are confusing cause you'd expect them to mention `beta.8` instead maybe (or is it just me? :D ). ## What was done? Change it so that the version string would look like this: on tag: ~`v20.0.0-beta.8-dev` or `v20.0.0-beta.8-gitarc`~ `v20.0.0-beta.8` post-tag: ~`v20.0.0-beta.8-1-gb837e08164-gitarc`~ `v20.0.0-beta.8-1-gb837e08164` post-tag format is `recent tag`-`commits since that tag`-`g+12 chars of commit hash`-`dirty (optional)` ~-`dev or gitarc`~ ~`dev`/`gitarc` suffixes should help avoiding confusion with the release versions and they also indicate the way non-release binaries were built.~ Note that release binaries do not use any of this, they still use `PACKAGE_VERSION` from `configure` like before. Also, `CLIENT_VERSION_RC` is no longer used in this setup so it was removed. Few things aren't clear to me yet: 1. Version bump in `configure.ac` no longer affects the reported version (unless it's an actual release). Are there any downsides I might be missing? 2. Which tag should we use on `develop` once we bump version in configure? `v21.0.0-init`? `v21.0.0-alpha1`? 3. How is it going to behave once `merge master back into develop` kind of PR is merged? E.g. say `develop` branch is on `v21.0.0-alpha1` tag and we merge v20.1.0 from `master` back into it. Will this bring `v20.1.0` release tag into `develop`? Will it become the one that will be used from that moment? If so we will probably need another tag on `develop` every time such PR is merged e.g. `v21.0.0-alpha2` (or whatever the next number is). Don't think these are blockers but would like to hear thoughts from others. ## How Has This Been Tested? Built binaries locally, built them using guix at a specific tag and at some commit on top of it. ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_
94 lines
3.1 KiB
YAML
94 lines
3.1 KiB
YAML
name: Guix Build
|
|
|
|
on:
|
|
pull_request:
|
|
types: [ labeled ]
|
|
workflow_dispatch:
|
|
|
|
jobs:
|
|
build:
|
|
runs-on: [ "self-hosted", "linux", "x64", "ubuntu-core" ]
|
|
if: contains(github.event.pull_request.labels.*.name, 'guix-build')
|
|
timeout-minutes: 480
|
|
steps:
|
|
- name: Checkout
|
|
uses: actions/checkout@v4
|
|
with:
|
|
ref: ${{ github.event.pull_request.head.sha }}
|
|
path: dash
|
|
fetch-depth: 0
|
|
|
|
- name: Set up Docker Buildx
|
|
uses: docker/setup-buildx-action@v3
|
|
|
|
- name: Commit variables
|
|
id: dockerfile
|
|
run: |
|
|
echo "hash=$(sha256sum ./dash/contrib/containers/guix/Dockerfile | cut -d ' ' -f1)" >> $GITHUB_OUTPUT
|
|
echo "host_user_id=$(id -u)" >> $GITHUB_OUTPUT
|
|
echo "host_group_id=$(id -g)" >> $GITHUB_OUTPUT
|
|
|
|
- name: Build Docker image
|
|
uses: docker/build-push-action@v5
|
|
with:
|
|
context: ${{ github.workspace }}/dash
|
|
build-args: |
|
|
USER_ID=${{ steps.dockerfile.outputs.host_user_id }}
|
|
GROUP_ID=${{ steps.dockerfile.outputs.host_group_id }}
|
|
build-contexts: |
|
|
docker_root=${{ github.workspace }}/dash/contrib/containers/guix
|
|
file: ./dash/contrib/containers/guix/Dockerfile
|
|
load: true
|
|
tags: guix_ubuntu:latest
|
|
cache-from: type=gha
|
|
cache-to: type=gha,mode=max
|
|
|
|
- name: Restore Guix cache and depends
|
|
id: guix-cache-restore
|
|
uses: actions/cache/restore@v3
|
|
with:
|
|
path: |
|
|
${{ github.workspace }}/.cache
|
|
${{ github.workspace }}/dash/depends/built
|
|
${{ github.workspace }}/dash/depends/sources
|
|
${{ github.workspace }}/dash/depends/work
|
|
key: ${{ runner.os }}-guix
|
|
|
|
- name: Create .cache folder if missing
|
|
if: steps.guix-cache-restore.outputs.cache-hit != 'true'
|
|
run: mkdir -p .cache
|
|
|
|
- name: Run Guix build
|
|
timeout-minutes: 480
|
|
run: |
|
|
docker run --privileged -d --rm -t \
|
|
--name guix-daemon \
|
|
-e ADDITIONAL_GUIX_COMMON_FLAGS="--max-jobs=$(nproc --all)" \
|
|
-v ${{ github.workspace }}/dash:/src/dash \
|
|
-v ${{ github.workspace }}/.cache:/home/ubuntu/.cache \
|
|
-w /src/dash \
|
|
guix_ubuntu:latest && \
|
|
docker exec guix-daemon bash -c '/usr/local/bin/guix-start'
|
|
|
|
- name: Ensure build passes
|
|
run: |
|
|
if [[ $? != 0 ]]; then
|
|
echo "Guix build failed!"
|
|
exit 1
|
|
fi
|
|
|
|
- name: Save Guix cache and depends
|
|
id: guix-cache-save
|
|
uses: actions/cache/save@v3
|
|
with:
|
|
path: |
|
|
${{ github.workspace }}/.cache
|
|
${{ github.workspace }}/dash/depends/built
|
|
${{ github.workspace }}/dash/depends/sources
|
|
${{ github.workspace }}/dash/depends/work
|
|
key: ${{ steps.guix-cache-restore.outputs.cache-primary-key }}
|
|
|
|
- name: Compute SHA256 checksums
|
|
run: |
|
|
./dash/contrib/containers/guix/scripts/guix-check ${{ github.workspace }}/dash
|