Skip to content

Commit b39c23f

Browse files
authored
Merge pull request #439 from pSchlarb/GHARefactoring
fix deb version build
2 parents 9353d97 + 34f3892 commit b39c23f

2 files changed

Lines changed: 13 additions & 7 deletions

File tree

.github/workflows/publishRelease.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,31 +54,31 @@ jobs:
5454
uses: actions/checkout@v3
5555

5656
- name: Download sovtoken deb Artifacts from Github Action Artifacts
57-
uses: dawidd6/action-download-artifact@v3
57+
uses: dawidd6/action-download-artifact@v2
5858
with:
5959
github_token: ${{secrets.GITHUB_TOKEN}}
6060
workflow: releasepr.yaml
6161
workflow_conclusion: success
6262
name: sovtoken-deb
6363
path: artifacts/sovtoken-deb
6464
- name: Download sovtokenfees python Artifacts from Github Action Artifacts
65-
uses: dawidd6/action-download-artifact@v3
65+
uses: dawidd6/action-download-artifact@v2
6666
with:
6767
github_token: ${{secrets.GITHUB_TOKEN}}
6868
workflow: releasepr.yaml
6969
workflow_conclusion: success
7070
name: sovtokenfees-deb
7171
path: artifacts/sovtokenfees-deb
7272
- name: Download sovtoken python Artifacts from Github Action Artifacts
73-
uses: dawidd6/action-download-artifact@v3
73+
uses: dawidd6/action-download-artifact@v2
7474
with:
7575
github_token: ${{secrets.GITHUB_TOKEN}}
7676
workflow: releasepr.yaml
7777
workflow_conclusion: success
7878
name: sovtoken-python
7979
path: artifacts/sovtoken-python
8080
- name: Download sovtokenfees python Artifacts from Github Action Artifacts
81-
uses: dawidd6/action-download-artifact@v3
81+
uses: dawidd6/action-download-artifact@v2
8282
with:
8383
github_token: ${{secrets.GITHUB_TOKEN}}
8484
workflow: releasepr.yaml

.github/workflows/reuseable_build_package.yaml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,24 @@ jobs:
4343
- name: Set Version with UX-timestamp
4444
if: ${{ inputs.isDev }}
4545
run: python3 updateVersion.py --timestamp ${{ needs.timestamp.outputs.timestamp }}
46+
- name: Get current Version
47+
id: version
48+
run: |
49+
version=$(python3 updateVersion.py --getVersion)
50+
debVersion=$(echo $version | sed -r 's/-/~/g')
51+
echo "debVersion=$debVersion">>$GITHUB_OUTPUT
4652
- name: Get indy-node version to depend on
4753
id: node-version
4854
shell: bash
4955
run: |
5056
version=$(grep -oP "\d+.\d+.\d+((-|.)?rc\d+)?" <<< $(grep -oP "indy-node==\d+.\d+.\d+((-|.)?rc\d+)?" sovtokenfees/setup.py) || true)
5157
echo $version > indy-node-version.txt
52-
echo "::set-output name=nodeVersion::$(sed 's/\./\~/3' indy-node-version.txt)"
58+
echo "nodeVersion=$(sed 's/\./\~/3' indy-node-version.txt)" >> $GITHUB_OUTPUT
5359
- name: Build Token Plugin deployment package
5460
run: |
5561
mkdir -p /tmp/build-output
56-
fpm --input-type dir --output-type deb --name sovtoken --architecture amd64 --maintainer "Sovrin" --no-python-fix-name --version $(./updateVersion.py --getVersion) --depends "indy-node(=${{ steps.node-version.outputs.nodeVersion }})" --verbose --no-python-dependencies --after-install ./devops/build-scripts/focal/sovtoken/postinst --before-remove ./devops/build-scripts/focal/sovtoken/prerm --exclude "*.pyo" --exclude "*.pyc" --no-python-fix-dependencies --python-bin "/usr/bin/python3" --force sovtoken/
57-
fpm --input-type dir --output-type deb --name sovtokenfees --architecture amd64 --maintainer "Sovrin" --no-python-fix-name --version $(./updateVersion.py --getVersion) --depends "indy-node(=${{ steps.node-version.outputs.nodeVersion }})" --verbose --no-python-dependencies --after-install ./devops/build-scripts/focal/sovtokenfees/postinst --before-remove ./devops/build-scripts/focal/sovtokenfees/prerm --exclude "*.pyo" --exclude "*.pyc" --no-python-fix-dependencies --python-bin "/usr/bin/python3" --force sovtokenfees/
62+
fpm --input-type dir --output-type deb --name sovtoken --architecture amd64 --maintainer "Sovrin" --no-python-fix-name --version ${{ steps.version.outputs.debVersion }} --depends "indy-node(=${{ steps.node-version.outputs.nodeVersion }})" --verbose --no-python-dependencies --after-install ./devops/build-scripts/focal/sovtoken/postinst --before-remove ./devops/build-scripts/focal/sovtoken/prerm --exclude "*.pyo" --exclude "*.pyc" --no-python-fix-dependencies --python-bin "/usr/bin/python3" --force sovtoken/
63+
fpm --input-type dir --output-type deb --name sovtokenfees --architecture amd64 --maintainer "Sovrin" --no-python-fix-name --version ${{ steps.version.outputs.debVersion }} --depends "indy-node(=${{ steps.node-version.outputs.nodeVersion }})" --verbose --no-python-dependencies --after-install ./devops/build-scripts/focal/sovtokenfees/postinst --before-remove ./devops/build-scripts/focal/sovtokenfees/prerm --exclude "*.pyo" --exclude "*.pyc" --no-python-fix-dependencies --python-bin "/usr/bin/python3" --force sovtokenfees/
5864
mv ./*.deb /tmp/build-output
5965
- name: Upload sovtoken-deb
6066
uses: actions/upload-artifact@v3

0 commit comments

Comments
 (0)