From e3c919a8b8db76a9a890e9399245a47d66844824 Mon Sep 17 00:00:00 2001 From: jpic Date: Wed, 24 May 2023 09:05:06 +0200 Subject: [PATCH] Release action: fix changelog execution --- .github/workflows/release.yml | 4 ++-- CHANGELOG | 1 + changelog.py | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- setup.py | 2 +- 6 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 980cf41e..f727ecde 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: - name: Check out repository code uses: actions/checkout@v3 with: - fetch-depth: 2 + fetch-depth: 0 - name: Fix permissions run: chown -R app:app . - name: Update npm @@ -35,7 +35,7 @@ jobs: run: git config --global --add safe.directory /__w/django-autocomplete-light/django-autocomplete-light - name: Tell git we are on master branch run: | - git fetch origin master:refs/remotes/origin/master + #git fetch origin master:refs/remotes/origin/master git reset --soft origin/master - name: Get last commit message id: last-commit-message diff --git a/CHANGELOG b/CHANGELOG index 604d88dc..7611f731 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,6 @@ + 3.9.5-rc6 2023-04-07 Release 3.9.5-rc6 diff --git a/changelog.py b/changelog.py index a16d6343..70a0eef3 100644 --- a/changelog.py +++ b/changelog.py @@ -26,6 +26,8 @@ shell=True, ).decode('utf8').split('\n') +print('git log:', git_log) + tags = {} tag_commits = [] for line in git_log: diff --git a/package-lock.json b/package-lock.json index 9c67f49c..68f247e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "django-autocomplete-light", - "version": "3.9.8rc24", + "version": "3.9.8rc29", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "django-autocomplete-light", - "version": "3.9.8rc24", + "version": "3.9.8rc29", "license": "MIT", "dependencies": { "semver": "latest" diff --git a/package.json b/package.json index 5346087a..392337b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "django-autocomplete-light", - "version": "3.9.8rc24", + "version": "3.9.8rc29", "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 ebbc376d..21af429f 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ def read(fname): setup( name='django-autocomplete-light', - version='3.9.8rc24', + version='3.9.8rc29', description='Fresh autocompletes for Django', author='James Pic', author_email='jamespic@gmail.com',