From a6a3c5df84242682b492dfd698ec97077b16bc3c Mon Sep 17 00:00:00 2001 From: Mirko von Leipzig Date: Wed, 6 Nov 2024 21:26:59 +0200 Subject: [PATCH] Fix indentation --- .github/actions/build_package/action.yml | 58 +++++++++++++++--------- .github/workflows/package.yml | 18 ++++---- 2 files changed, 46 insertions(+), 30 deletions(-) diff --git a/.github/actions/build_package/action.yml b/.github/actions/build_package/action.yml index 998d0090..d44b02cf 100644 --- a/.github/actions/build_package/action.yml +++ b/.github/actions/build_package/action.yml @@ -12,23 +12,19 @@ runs: id: git-sha shell: bash run: | - if git show-ref -q --verify "refs/remotes/origin/$gitref" 2>/dev/null; then - echo "sha=$(git show-ref --hash --verify "refs/remotes/origin/$gitref")" >> $GITHUB_OUTPUT - elif git show-ref -q --verify "refs/tags/$gitref" 2>/dev/null; then - echo "sha=$(git show-ref --hash --verify "refs/tags/$gitref")" >> $GITHUB_OUTPUT - elif git rev-parse --verify "$gitref^{commit}" >/dev/null 2>&1; then - echo "sha=$(git rev-parse --verify "$gitref^{commit})" >> $GITHUB_OUTPUT + if git show-ref -q --verify "refs/remotes/origin/${{ inputs.gitref }}" 2>/dev/null; then + echo "sha=$(git show-ref --hash --verify 'refs/remotes/origin/${{ inputs.gitref }}')" >> $GITHUB_OUTPUT + elif git show-ref -q --verify "refs/tags/${{ inputs.gitref }}" 2>/dev/null; then + echo "sha=$(git show-ref --hash --verify 'refs/tags/${{ inputs.gitref }}')" >> $GITHUB_OUTPUT + elif git rev-parse --verify "${{ inputs.gitreff }}^{commit}" >/dev/null 2>&1; then + echo "sha=$(git rev-parse --verify '${{ inputs.gitref }}^{commit}')" >> $GITHUB_OUTPUT else echo "::error Unknown git reference type" - # exit 1 + exit 1 fi - - name: Build binaries - run: | - cargo install miden-node --locked --features testing --git ${{ github.repositoryUrl }} --rev ${{ steps.git-sha.outputs.sha }} - cargo install miden-faucet --locked --features testing --git ${{ github.repositoryUrl }} --rev ${{ steps.git-sha.outputs.sha }} - - name: Create package directories + shell: bash run: | mkdir -p \ packaging/deb/miden-node/DEBIAN \ @@ -44,13 +40,9 @@ runs: packaging/deb/miden-faucet/etc/miden\ packaging/deb/miden-faucet/opt/miden/miden-faucet - - name: Copy binary files - run: | - cp -p $CARGO_HOME/bin/miden-node packaging/deb/miden-node/urs/bin/ - cp -p $CARGO_HOME/bin/miden-faucet packaging/deb/miden-faucet/urs/bin/ - # These have to be downloaded as the current repo source isn't necessarily the target git reference. - name: Copy package install scripts + shell: bash run: | git show ${{ steps.git-sha.outputs.sha }}:packaging/miden-node.service > packaging/deb/miden-node/lib/systemd/system/miden-node.service git show ${{ steps.git-sha.outputs.sha }}:packaging/postinst > packaging/deb/miden-node/DEBIAN/postinst @@ -59,14 +51,23 @@ runs: git show ${{ steps.git-sha.outputs.sha }}:packaging/postinst > packaging/deb/miden-faucet/DEBIAN/postinst git show ${{ steps.git-sha.outputs.sha }}:packaging/postrm > packaging/deb/miden-faucet/DEBIAN/postrm + - name: Platform architecture + shell: bash + run: | + # Control file's architecture field does not allow underscores, so use amd64. + arch=$(uname -m | sed "s/x86_64/amd64/") + echo "arch=$arch" >> $GITHUB_ENV + + # Its unclear what to set the Version field to for non-tagged values. - name: Create control files + shell: bash run: | cat > packaging/deb/miden-node/DEBIAN/control << EOF Package: miden-node - Version: ${{ inputs.gitref }} + Version: 0 Section: base Priority: optional - Architecture: $(uname -m) + Architecture: ${{ env.arch }} Maintainer: Polygon Devops Description: miden-node binary package Homepage: https://polygon.technology/polygon-miden @@ -76,10 +77,10 @@ runs: cat > packaging/deb/miden-faucet/DEBIAN/control << EOF Package: miden-faucet - Version: ${{ inputs.gitref }} + Version: 0 Section: base Priority: optional - Architecture: $(uname -m) + Architecture: ${{ env.arch }} Maintainer: Polygon Devops Description: miden-faucet binary package Homepage: https://polygon.technology/polygon-miden @@ -87,7 +88,22 @@ runs: Vcs-Browser: https://github.com/0xPolygonMiden/miden-node EOF + # - name: Build binaries + # shell: bash + # env: + # repo-url: ${{ github.server_url }}/${{ github.repository }} + # run: | + # cargo install miden-node --root . --locked --features testing --git ${{ env.repo-url }} --rev ${{ steps.git-sha.outputs.sha }} + # cargo install miden-faucet --root . --locked --features testing --git ${{ env.repo-url }} --rev ${{ steps.git-sha.outputs.sha }} + + # - name: Copy binary files + # shell: bash + # run: | + # cp -p ./bin/miden-node packaging/deb/miden-node/usr/bin/ + # cp -p ./bin/miden-faucet packaging/deb/miden-faucet/usr/bin/ + - name: Build packages + shell: bash run: | dpkg-deb --build --root-owner-group packaging/deb/miden-node dpkg-deb --build --root-owner-group packaging/deb/miden-faucet diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 3db431db..f96a6c2e 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -1,5 +1,5 @@ name: Release packages -run-name: Release packaging for ${{ env.version }} +run-name: Release packaging for ${{ inputs.version || github.ref }} env: version: ${{ inputs.version || github.ref }} @@ -21,10 +21,11 @@ permissions: jobs: package: - matrix: - os: [ubuntu-latest, ubuntu22-arm-4core] + strategy: + matrix: + runner: [ubuntu-latest, ubuntu22-arm-4core] runs-on: - labels: ${{ matrix.os }} + labels: ${{ matrix.runner }} steps: # Note that this checkout is _not_ used as the source for the package. # Instead this is required to access the workflow actions. Package source @@ -35,16 +36,15 @@ jobs: fetch-depth: 0 - name: Build packages - uses: ./.github/actions/build_packages + uses: ./.github/actions/build_package with: gitref: ${{ env.version }} - name: Package names - env: - arch: $(uname -m) run: | - echo "node-package=$(echo miden-node-${{ env.version }}-${{ env.arch }}.deb") >> $GITHUB_ENV - echo "faucet-package=$(echo miden-faucet-${{ env.version }}-${{ env.arch }}.deb") >> $GITHUB_ENV + arch=$(uname -m) + echo "node-package=miden-node-${{ env.version }}-$arch.deb" >> $GITHUB_ENV + echo "faucet-package=miden-faucet-${{ env.version }}-$arch.deb" >> $GITHUB_ENV - name: Rename package files run: |