diff --git a/.circleci/config.yml b/.circleci/config.yml index 30fc83c04..b11654028 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -178,43 +178,43 @@ jobs: steps: - checkout - - run: - name: '[Dry run] Deploy to PyPI' - # Side effects: does an actual release, but to the test PyPI - command: bash ci/pypi/ci-deploy.sh --dry-run - - run: - name: '[Dry run] Wait up to 30 minutes for PyPI package to be available' - command: bash ci/pypi/ci-wait-for-package.sh test.pypi.org 30 - - - run: - name: '[Dry run] Update Homebrew with local installation test' - # Prerequisites: artifacts must be released to test PyPI first - command: bash ci/homebrew/ci-deploy.sh --dry-run - - - run: - name: '[Dry run] Publish image to Docker Hub' - command: bash ci/docker/ci-deploy.sh --dry-run +# - run: +# name: '[Dry run] Deploy to PyPI' +# # Side effects: does an actual release, but to the test PyPI +# command: bash ci/pypi/ci-deploy.sh --dry-run +# - run: +# name: '[Dry run] Wait up to 30 minutes for PyPI package to be available' +# command: bash ci/pypi/ci-wait-for-package.sh test.pypi.org 30 +# +# - run: +# name: '[Dry run] Update Homebrew with local installation test' +# # Prerequisites: artifacts must be released to test PyPI first +# command: bash ci/homebrew/ci-deploy.sh --dry-run +# +# - run: +# name: '[Dry run] Publish image to Docker Hub' +# command: bash ci/docker/ci-deploy.sh --dry-run - run: name: '[Dry run] Build & upload deb package to PPA' # Side effects: potentially pushes a regenerated Docker image command: bash ci/deb-ppa-upload/ci-deploy.sh --dry-run - - run: - name: '[Dry run] Build Nix package' - # Side effects: potentially pushes a regenerated Docker image - # Other than that, it just builds the package without publishing anything; there's no special dry-run mode - command: bash ci/nixpkgs-build/ci-run.sh - - - run: - name: '[Dry run] Build snap' - command: bash ci/snap/ci-deploy.sh --dry-run - - - run: - name: '[Dry run] Build rpm package' - # Side effects: potentially pushes a regenerated Docker image - # Other than that, it just builds the package without publishing anything; there's no special dry-run mode - command: bash ci/rpm/ci-run.sh +# - run: +# name: '[Dry run] Build Nix package' +# # Side effects: potentially pushes a regenerated Docker image +# # Other than that, it just builds the package without publishing anything; there's no special dry-run mode +# command: bash ci/nixpkgs-build/ci-run.sh +# +# - run: +# name: '[Dry run] Build snap' +# command: bash ci/snap/ci-deploy.sh --dry-run +# +# - run: +# name: '[Dry run] Build rpm package' +# # Side effects: potentially pushes a regenerated Docker image +# # Other than that, it just builds the package without publishing anything; there's no special dry-run mode +# command: bash ci/rpm/ci-run.sh "deploy from master": executor: ubuntu_executor @@ -285,29 +285,29 @@ workflows: version: 2 build: jobs: - - general checks - - python 3_6 git 1_8_0 - - python 3_7 git 2_7_6 - - python 3_8 git 2_25_0 - - python 3_9 git 2_30_1 - - pep8 and python 3_10 git 2_33_1 - - docs and python 3_11 git 2_38_1 - - macos tests - - windows tests - - coverage upload: - requires: - *mandatory_jobs - - dry run deploy: - filters: - branches: - only: - - "develop" - - "/hotfix.*/" - requires: - *mandatory_jobs - - deploy from master: - filters: - branches: - only: "master" - requires: - *mandatory_jobs +# - general checks +# - python 3_6 git 1_8_0 +# - python 3_7 git 2_7_6 +# - python 3_8 git 2_25_0 +# - python 3_9 git 2_30_1 +# - pep8 and python 3_10 git 2_33_1 +# - docs and python 3_11 git 2_38_1 +# - macos tests +# - windows tests +# - coverage upload: +# requires: +# *mandatory_jobs + - dry run deploy #: +# filters: +# branches: +# only: +# - "develop" +# - "/hotfix.*/" +# requires: +# *mandatory_jobs +# - deploy from master: +# filters: +# branches: +# only: "master" +# requires: +# *mandatory_jobs diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4cceb9e46..227355343 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,7 +1,13 @@ # Release notes +## New in git-machete 3.17.8 + +- fixed: building the package for Ubuntu PPA + ## New in git-machete 3.17.7 +- fixed: `fish` completion no longer prompts file names alongside commands/flags (contributed by @guyboltonking) + ## New in git-machete 3.17.6 - fixed: `git machete github` not being able to retrieve token used by `gh` for `gh` version >= 2.31.0 (reported by @domesticsimian) diff --git a/ci/checks/enforce-version-bumped.sh b/ci/checks/enforce-bumped-version.sh similarity index 71% rename from ci/checks/enforce-version-bumped.sh rename to ci/checks/enforce-bumped-version.sh index 95cea32ef..ad45ba593 100755 --- a/ci/checks/enforce-version-bumped.sh +++ b/ci/checks/enforce-bumped-version.sh @@ -7,6 +7,6 @@ last_tag_version=${last_tag/v/} current_version=$(python3 setup.py --version) if [[ "$(echo -e "$current_version\n$last_tag_version" | sort --version-sort | tail -n 1)" == "$last_tag_version" ]]; then - echo "Please increment version with new release! Last released version: $last_tag_version" + echo "Please increment version in git_machete/__init__.py with a new release! Last released version: $last_tag_version" exit 1 fi diff --git a/ci/checks/run-all-checks.sh b/ci/checks/run-all-checks.sh index 05f4c96f9..17b4ae773 100755 --- a/ci/checks/run-all-checks.sh +++ b/ci/checks/run-all-checks.sh @@ -9,6 +9,7 @@ PATH=./ci/checks:$PATH # (rather than searching the right script by error message). set -e -x +enforce-bumped-version.sh enforce-completion-scripts-correct.sh enforce-consistent-style-for-fork-point.sh enforce-consistent-style-for-github.sh @@ -24,7 +25,6 @@ enforce-mocking-only-whitelisted-methods.sh enforce-newline-at-eof.sh enforce-release-notes-up-to-date.sh enforce-shell-scripts-pass-shellcheck.sh -enforce-version-bumped.sh prohibit-bash-usages-from-python.sh prohibit-deploy-step-in-circleci.sh prohibit-double-backticks-in-python.sh diff --git a/ci/deb-ppa-upload/build-context/run.sh b/ci/deb-ppa-upload/build-context/run.sh index 2d6fb8148..187010b06 100644 --- a/ci/deb-ppa-upload/build-context/run.sh +++ b/ci/deb-ppa-upload/build-context/run.sh @@ -49,7 +49,10 @@ debuild -S -p"/gpg-wrapper.sh" cat ../python3-git-machete_*.dsc cat ../python3-git-machete_*_source.buildinfo cat ../python3-git-machete_*_source.changes -tar tvf ../python3-git-machete_*.tar.gz + +tar_output=$(tar tvf ../python3-git-machete_*.tar.gz) +grep completion/ <<< "$tar_output" +grep docs/man/git-machete\.1 <<< "$tar_output" envsubst '$LAUNCHPAD_USERNAME' < /dput.cf.envsubst | tee /etc/dput.cf if [[ $DO_DPUT == true ]]; then diff --git a/git_machete/__init__.py b/git_machete/__init__.py index 262a85dd4..8ddac3da9 100644 --- a/git_machete/__init__.py +++ b/git_machete/__init__.py @@ -1 +1 @@ -__version__ = '3.17.7' +__version__ = '3.17.8'