Skip to content

Commit 17dc100

Browse files
Thinh Nguyenguzman-raphael
andauthored
Apply suggestions from code review
Co-authored-by: Raphael Guzman <38401847+guzman-raphael@users.noreply.github.com>
1 parent e04f739 commit 17dc100

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.github/workflows/development.yaml

Lines changed: 5 additions & 5 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\' '/pkg_name = / {print $2}')
26+
export PKG_NAME=$(echo ${PWD##*/} | sed 's|-|_|g')
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
@@ -53,16 +53,16 @@ jobs:
5353
needs: build
5454
runs-on: ubuntu-latest
5555
env:
56-
TWINE_USERNAME: ${{secrets.twine_username}}
57-
TWINE_PASSWORD: ${{secrets.twine_password}}
56+
TWINE_USERNAME: ${{secrets.twine_test_username}}
57+
TWINE_PASSWORD: ${{secrets.twine_test_password}}
5858
outputs:
5959
release_upload_url: ${{steps.create_gh_release.outputs.upload_url}}
6060
steps:
6161
- uses: actions/checkout@v2
6262
- name: Determine package version
6363
run: |
64-
SDIST_PKG_NAME=$(cat setup.py | awk -F\' '/ name=/ {print $2}')
65-
PKG_NAME=$(cat setup.py | awk -F\' '/pkg_name = / {print $2}')
64+
SDIST_PKG_NAME=${PWD##*/}
65+
PKG_NAME=$(echo ${PWD##*/} | sed 's|-|_|g')
6666
PKG_VERSION=$(cat ${PKG_NAME}/version.py | awk -F\' '/__version__ = / {print $2}')
6767
echo "PKG_NAME=${PKG_NAME}" >> $GITHUB_ENV
6868
echo "PKG_VERSION=${PKG_VERSION}" >> $GITHUB_ENV

docker-compose-build.yaml

Lines changed: 2 additions & 2 deletions
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\' '/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
1+
# PY_VER=3.8 IMAGE=djbase DISTRO=alpine PKG_NAME=$(echo ${PWD##*/} | sed 's|-|_|g') 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.
@@ -23,4 +23,4 @@ services:
2323
- |
2424
set -e
2525
rm -R build dist *.egg-info || echo "No prev build"
26-
python setup.py bdist_wheel sdist
26+
python setup.py bdist_wheel sdist

0 commit comments

Comments
 (0)