diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fd0c1c9..bc4a13d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -52,7 +52,7 @@ jobs: run: | git config --global user.name "GitHub Actions" git config --global user.email "actions@github.com" - poetry run semantic-release publish --verbosity=DEBUG --define=branch=${{ env.BRANCH }} + poetry run semantic-release publish --verbosity=DEBUG env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} REPOSITORY_USERNAME: __token__ diff --git a/CHANGELOG.md b/CHANGELOG.md index 98f6232..2aa8466 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ +## v0.39.4 (2024-07-17) + +### Fix + +* **chezmoidata:** Change gpg-suite from to optional ([`def18fb`](https://github.com/entelecheia/dotfiles/commit/def18fb836ec0cfed8a0605f21aeef27d2aebb0a)) + ## v0.39.3 (2024-07-17) ### Fix diff --git a/chezmoi/.chezmoidata.yaml b/chezmoi/.chezmoidata.yaml index 6e7ebc0..3bf74e9 100644 --- a/chezmoi/.chezmoidata.yaml +++ b/chezmoi/.chezmoidata.yaml @@ -1,4 +1,4 @@ -DOTFILES_VERSION: 0.39.3 +DOTFILES_VERSION: 0.39.4 packages: - name: 1password-cli apt: true diff --git a/chezmoi/dot_local/bin/executable_github-auth.tmpl b/chezmoi/dot_local/bin/executable_github-auth.tmpl index 8bdf5a9..64ab23d 100644 --- a/chezmoi/dot_local/bin/executable_github-auth.tmpl +++ b/chezmoi/dot_local/bin/executable_github-auth.tmpl @@ -15,22 +15,23 @@ usage() { exit 1 } -while (( "$#" )); do +while (("$#")); do case "$1" in - --interactive|-i) - INTERACTIVE=true - shift - ;; - --reset|-r) - RESET=true - shift - ;; - --help|-h) - usage - ;; - *) - echo "Error: Invalid argument" - usage + --interactive | -i) + INTERACTIVE=true + shift + ;; + --reset | -r) + RESET=true + shift + ;; + --help | -h) + usage + ;; + *) + echo "Error: Invalid argument" + usage + ;; esac done @@ -47,6 +48,10 @@ if [[ -z "${GITHUB_USERNAME}" ]]; then log_info "GITHUB_USERNAME environment variable is not set. Skipping GitHub authentication." exit 0 fi +if [[ -z "${GITHUB_TOKEN}" ]] || [[ "${GITHUB_TOKEN}" == "null" ]] || [[ "${GITHUB_TOKEN}" == "NULL" ]]; then + unset GITHUB_TOKEN + unset GH_TOKEN +fi if ! command -v gh >/dev/null; then log_info "gh is not installed. Skipping GitHub authentication." exit 0 @@ -54,8 +59,8 @@ fi if [[ "${RESET}" == "true" ]]; then log_info "Resetting GitHub authentication" - export GITHUB_TOKEN="" - export GH_TOKEN="" + unset GITHUB_TOKEN + unset GH_TOKEN fi c gh config set -h github.com git_protocol https @@ -72,9 +77,9 @@ if [[ "${INTERACTIVE}" == "true" ]]; then export GH_TOKEN="${GITHUB_TOKEN}" else if [[ -n "${GITHUB_TOKEN}" ]]; then - log_info "Logging in to GitHub" - GITHUB_TOKEN="{{ .github.token }}" - echo "${GITHUB_TOKEN}" | gh auth login --with-token || true + log_info "Logging in to GitHub" + GITHUB_TOKEN="{{ .github.token }}" + echo "${GITHUB_TOKEN}" | gh auth login --with-token || true else log_manual_action "GITHUB_TOKEN environment variable is not set. Run this again with the --interactive flag to login to GitHub." fi diff --git a/pyproject.toml b/pyproject.toml index 3ed4e12..5f65ed4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "dotfiles" -version = "0.39.3" +version = "0.39.4" description = "Easily manage and synchronize your dotfiles across multiple environments with the Dotfiles project, streamlining your development setup and CI/CD pipeline." authors = ["Young Joon Lee "] license = "MIT"