diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4088691b..980cf41e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -14,18 +14,19 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 2 - - name: Build JS for dal_select2 - run: | - chown -R app:app . - npm update -g npm - su - app -c "cd $(pwd) && npm install && npm run build" + - name: Fix permissions + run: chown -R app:app . + - name: Update npm + run: npm update -g npm - name: Update version in setup.py and docs/conf.py run: | short=$(echo ${GITHUB_REF##*/} | grep -Eo '[^.]+\.[^.]+') - sed -i "s/version\": \"[^\"]*\"/version\": \"$short\"/" package.json + sed -i "s/version\": \"[^\"]*\"/version\": \"${GITHUB_REF##*/}\"/" package.json sed -i "s/version=[^,]*,/version='${GITHUB_REF##*/}',/" setup.py sed -i "s/release = [^,]*,/release = '${GITHUB_REF##*/}'/" docs/conf.py sed -i "s/version = [^,]*,/version = '${GITHUB_REF##*/}'/" docs/conf.py + - name: Build js + run: su - app -c "cd $(pwd) && npm install && npm run build" - name: Update changelog run: | export GITHUB_TOKEN="${{ secrets.GITHUB_TOKEN }}" @@ -39,6 +40,13 @@ jobs: - name: Get last commit message id: last-commit-message run: echo "msg=$(git log -1 --pretty=%s)" >> $GITHUB_OUTPUT + - name: Build python package + run: python setup.py sdist + - name: Twine upload + env: + TWINE_USERNAME: __token__ + TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} + run: twine upload dist/django-autocomplete-light-${GITHUB_REF##*/}.tar.gz - name: Commit all generated files uses: stefanzweifel/git-auto-commit-action@v4 with: @@ -48,10 +56,3 @@ jobs: commit_message: ${{ steps.last-commit-message.outputs.msg }} branch: master skip_fetch: true - - name: Build python package - run: python setup.py sdist - - name: Twine upload - env: - TWINE_USERNAME: __token__ - TWINE_PASSWORD: ${{ secrets.TWINE_PASSWORD }} - run: twine upload dist/django-autocomplete-light-${GITHUB_REF##*/}.tar.gz diff --git a/CHANGELOG b/CHANGELOG index cae60c86..604d88dc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,5 @@ + 3.9.5-rc6 2023-04-07 Release 3.9.5-rc6 diff --git a/package-lock.json b/package-lock.json index 7848c818..9c67f49c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "django-autocomplete-light", - "version": "3.5.1", + "version": "3.9.8rc24", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "django-autocomplete-light", - "version": "3.5.1", + "version": "3.9.8rc24", "license": "MIT", "dependencies": { "semver": "latest" diff --git a/package.json b/package.json index 35b20b11..5346087a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "django-autocomplete-light", - "version": "3.9", + "version": "3.9.8rc24", "description": "A fresh approach to autocomplete implementations, specially for Django. Status: v3 stable, 2.x.x stable, 1.x.x deprecated. Please DO regularely ping us with your link at #yourlabs IRC channel https://django-autocomplete-light.readthedocs.io/", "directories": { "doc": "docs" diff --git a/setup.py b/setup.py index e21a0cb1..ebbc376d 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def read(fname): setup( name='django-autocomplete-light', - version='3.9.8rc20', + version='3.9.8rc24', description='Fresh autocompletes for Django', author='James Pic', author_email='jamespic@gmail.com',