Skip to content

Commit e8632a3

Browse files
author
Thinh Nguyen
committed
bugfix, add SDIST_PKG_NAME
1 parent be26e4b commit e8632a3

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

.github/workflows/development.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
- uses: actions/checkout@v2
2424
- name: Compile image
2525
run: |
26-
export PKG_NAME=$(cat setup.py | awk -F\' '/ name=/ {print $2}')
26+
export PKG_NAME=$(cat setup.py | awk -F\' '/pkg_name = / {print $2}')
2727
export PKG_VERSION=$(cat ${PKG_NAME}/version.py | awk -F\' '/__version__ = / {print $2}')
2828
export HOST_UID=$(id -u)
2929
docker-compose -f docker-compose-build.yaml up --exit-code-from element --build
@@ -61,10 +61,12 @@ jobs:
6161
- uses: actions/checkout@v2
6262
- name: Determine package version
6363
run: |
64-
PKG_NAME=$(cat setup.py | awk -F\' '/ name=/ {print $2}')
64+
SDIST_PKG_NAME=$(cat setup.py | awk -F\' '/ name=/ {print $2}')
65+
PKG_NAME=$(cat setup.py | awk -F\' '/pkg_name = / {print $2}')
6566
PKG_VERSION=$(cat ${PKG_NAME}/version.py | awk -F\' '/__version__ = / {print $2}')
6667
echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_ENV
6768
echo "PKG_VERSION=${PKG_VERSION}" >> $GITHUB_ENV
69+
echo "SDIST_PKG_NAME=${SDIST_PKG_NAME}" >> $GITHUB_ENV
6870
- name: Get changelog entry
6971
id: changelog_reader
7072
uses: guzman-raphael/changelog-reader-action@v5
@@ -101,7 +103,7 @@ jobs:
101103
- name: Determine pip artifact paths
102104
run: |
103105
echo "PKG_WHEEL_PATH=$(ls dist/${PKG_NAME}-*.whl)" >> $GITHUB_ENV
104-
echo "PKG_SDIST_PATH=$(ls dist/${PKG_NAME}-*.tar.gz)" >> $GITHUB_ENV
106+
echo "PKG_SDIST_PATH=$(ls dist/${SDIST_PKG_NAME}-*.tar.gz)" >> $GITHUB_ENV
105107
- name: Upload pip wheel asset to release
106108
uses: actions/upload-release-asset@v1
107109
env:
@@ -118,5 +120,5 @@ jobs:
118120
with:
119121
upload_url: ${{steps.create_gh_release.outputs.upload_url}}
120122
asset_path: ${{env.PKG_SDIST_PATH}}
121-
asset_name: pip-${{env.PKG_NAME}}-${{env.PKG_VERSION}}.tar.gz
123+
asset_name: pip-${{env.SDIST_PKG_NAME}}-${{env.PKG_VERSION}}.tar.gz
122124
asset_content_type: application/gzip

docker-compose-build.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PKG_NAME=$(cat setup.py | awk -F\' '/ name=/ {print $2}') PKG_VERSION=$(cat ${PKG_NAME}/version.py | awk -F\' '/__version__/ {print $2}') HOST_UID=$(id -u) docker-compose -f docker-compose-build.yaml up --exit-code-from element --build
1+
# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PKG_NAME=$(cat setup.py | awk -F\' '/pkg_name = / {print $2}') PKG_VERSION=$(cat ${PKG_NAME}/version.py | awk -F\' '/__version__/ {print $2}') HOST_UID=$(id -u) docker-compose -f docker-compose-build.yaml up --exit-code-from element --build
22
#
33
# Intended for updating dependencies and docker image.
44
# Used to build release artifacts.

0 commit comments

Comments
 (0)