From fa498b277824fcb395378e4df1904dc966494da2 Mon Sep 17 00:00:00 2001 From: Gabriel Duke Date: Sun, 6 Jul 2025 09:35:46 -0400 Subject: [PATCH 1/2] fix ci --- .github/actions/auto-commit/entrypoint.sh | 2 +- .github/workflows/fmt.yml | 2 +- .github/workflows/push.yml | 13 ++++--------- .github/workflows/release.yml | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/actions/auto-commit/entrypoint.sh b/.github/actions/auto-commit/entrypoint.sh index f6df293..7a01be5 100644 --- a/.github/actions/auto-commit/entrypoint.sh +++ b/.github/actions/auto-commit/entrypoint.sh @@ -1,7 +1,7 @@ #!/bin/bash set -e -BRANCH=develop +BRANCH=master cat <<- EOF > $HOME/.netrc machine github.com diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml index b66a4e1..057e726 100644 --- a/.github/workflows/fmt.yml +++ b/.github/workflows/fmt.yml @@ -13,7 +13,7 @@ jobs: fmt: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: fmt uses: ./.github/actions/golang env: diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index d635f67..9d7f289 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -7,9 +7,7 @@ jobs: tag-master: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Mark repo as safe for Git - run: git config --global --add safe.directory /github/workspace + - uses: actions/checkout@v4 - name: tag uses: ./.github/actions/git-tags env: @@ -25,19 +23,16 @@ jobs: with: args: This is an auto-commit - name: generate-tagged-changelog - uses: docker://ferrarimarco/github-changelog-generator:1.15.0.pre.beta + uses: docker://ferrarimarco/github-changelog-generator:1.16.2 env: CHANGELOG_GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }} SRC_PATH: /github/workspace with: - entrypoint: /bin/sh - args: -c "git config --global --add safe.directory /github/workspace && github_changelog_generator -u gabeduke -p level --release-branch develop" - + args: -u gabeduke -p level --release-branch master - name: push-changelog uses: docker://whizark/chandler env: CHANDLER_GITHUB_API_TOKEN: ${{ secrets.CHANDLER_GITHUB_API_TOKEN }} CHANDLER_WORKDIR: /github/workspace with: - entrypoint: /bin/sh - args: -c "git config --global --add safe.directory /github/workspace && chandler push" \ No newline at end of file + args: push diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 36aeeff..bc1ef51 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,7 @@ jobs: CHANGELOG_GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }} SRC_PATH: /github/workspace with: - args: -u gabeduke -p level --release-branch develop + args: -u gabeduke -p level --release-branch master - name: goreleaser uses: docker://goreleaser/goreleaser env: From 4966a58d10238efa5a066d14c2324d5833ef2496 Mon Sep 17 00:00:00 2001 From: Gabriel Duke Date: Sun, 6 Jul 2025 09:40:53 -0400 Subject: [PATCH 2/2] fix ci --- .github/workflows/release.yml | 6 ++---- .github/workflows/test.yml | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index bc1ef51..0fa52f6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -6,11 +6,9 @@ jobs: created-filter: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: Mark repo as safe for Git - run: git config --global --add safe.directory /github/workspace + - uses: actions/checkout@v4 - name: generate-release-changelog - uses: docker://ferrarimarco/github-changelog-generator:1.15.0.pre.beta + uses: docker://ferrarimarco/github-changelog-generator:1.16.4 env: CHANGELOG_GITHUB_TOKEN: ${{ secrets.CHANGELOG_GITHUB_TOKEN }} SRC_PATH: /github/workspace diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 256e2de..53fcbdc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -13,7 +13,7 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: test uses: ./.github/actions/golang env: