Skip to content

Commit aafdbfe

Browse files
XyerophyteXyerophyte
authored
Merge branch 'master' into feature/git-flow-finish-args
2 parents d8d61ed + 38dd035 commit aafdbfe

File tree

959 files changed

+11464
-129709
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

959 files changed

+11464
-129709
lines changed

‎.github/dependabot.yml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,15 @@ updates:
44
directory: "/"
55
schedule:
66
interval: "weekly"
7-
allowed_updates:
8-
- match:
9-
update_type: "security"
7+
labels:
8+
- "maintenance"
9+
- "dependencies"
10+
- "go"
11+
- package-ecosystem: "github-actions"
12+
directory: "/"
13+
schedule:
14+
interval: "weekly"
15+
labels:
16+
- "maintenance"
17+
- "dependencies"
18+
- "github-actions"

‎.github/workflows/check-required-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
check-required-label:
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: mheap/github-action-required-labels@v5
11+
- uses: mheap/github-action-required-labels@0ac283b4e65c1fb28ce6079dea5546ceca98ccbe # v5
1212
with:
1313
mode: exactly
1414
count: 1

‎.github/workflows/ci.yml‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
mkdir -p /tmp/code_coverage
4040
go test ./... -short -cover -args "-test.gocoverdir=/tmp/code_coverage"
4141
- name: Upload code coverage artifacts
42-
uses: actions/upload-artifact@v6
42+
uses: actions/upload-artifact@v7
4343
with:
4444
name: coverage-unit-${{ matrix.os }}-${{ github.run_id }}
4545
path: /tmp/code_coverage
@@ -63,7 +63,7 @@ jobs:
6363
- name: Restore Git cache
6464
if: matrix.git-version != 'latest'
6565
id: cache-git-restore
66-
uses: actions/cache/restore@v4
66+
uses: actions/cache/restore@v5
6767
with:
6868
path: ~/git-${{matrix.git-version}}
6969
key: ${{runner.os}}-git-${{matrix.git-version}}
@@ -80,7 +80,7 @@ jobs:
8080
run: sudo make -C "$HOME/git-${{matrix.git-version}}" -j install
8181
- name: Save Git cache
8282
if: steps.cache-git-restore.outputs.cache-hit != 'true' && matrix.git-version != 'latest'
83-
uses: actions/cache/save@v4
83+
uses: actions/cache/save@v5
8484
with:
8585
path: ~/git-${{matrix.git-version}}
8686
key: ${{runner.os}}-git-${{matrix.git-version}}
@@ -98,7 +98,7 @@ jobs:
9898
mkdir -p /tmp/code_coverage
9999
./scripts/run_integration_tests.sh
100100
- name: Upload code coverage artifacts
101-
uses: actions/upload-artifact@v6
101+
uses: actions/upload-artifact@v7
102102
with:
103103
name: coverage-integration-${{ matrix.git-version }}-${{ github.run_id }}
104104
path: /tmp/code_coverage
@@ -168,7 +168,7 @@ jobs:
168168
with:
169169
go-version: 1.25.x
170170
- name: Lint
171-
uses: golangci/golangci-lint-action@v9
171+
uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # v9
172172
with:
173173
# If you change this, make sure to also update scripts/golangci-lint-shim.sh
174174
version: v2.4.0
@@ -190,7 +190,7 @@ jobs:
190190
go-version: 1.25.x
191191

192192
- name: Download all coverage artifacts
193-
uses: actions/download-artifact@v7
193+
uses: actions/download-artifact@v8
194194
with:
195195
path: /tmp/code_coverage
196196

@@ -206,10 +206,12 @@ jobs:
206206
207207
- name: Upload to Codacy
208208
run: |
209-
CODACY_PROJECT_TOKEN=${{ secrets.CODACY_PROJECT_TOKEN }} \
209+
CODACY_PROJECT_TOKEN="${CODACY_PROJECT_TOKEN}" \
210210
bash <(curl -Ls https://coverage.codacy.com/get.sh) report \
211211
--force-coverage-parser go -r coverage.out
212212
213+
env:
214+
CODACY_PROJECT_TOKEN: ${{ secrets.CODACY_PROJECT_TOKEN }}
213215
check-for-fixups:
214216
runs-on: ubuntu-latest
215217
if: github.ref != 'refs/heads/master'

‎.github/workflows/codespell.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ jobs:
2020
- name: Checkout
2121
uses: actions/checkout@v6
2222
- name: Annotate locations with typos
23-
uses: codespell-project/codespell-problem-matcher@v1
23+
uses: codespell-project/codespell-problem-matcher@9ba2c57125d4908eade4308f32c4ff814c184633 # v1.2.0
2424
- name: Codespell
25-
uses: codespell-project/actions-codespell@v2
25+
uses: codespell-project/actions-codespell@8f01853be192eb0f849a5c7d721450e7a467c579 # v2.2

‎.github/workflows/release.yml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,10 @@ jobs:
6565
echo "latest_tag=$latest_tag" >> $GITHUB_ENV
6666
6767
- name: Check for changes since last release
68+
env:
69+
LATEST_TAG: ${{ env.latest_tag }}
6870
run: |
69-
if [ -z "$(git diff --name-only ${{ env.latest_tag }})" ]; then
71+
if [ -z "$(git diff --name-only "$LATEST_TAG")" ]; then
7072
echo "No changes detected since last release"
7173
exit 1
7274
fi
@@ -110,12 +112,16 @@ jobs:
110112
GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }}
111113

112114
- name: Calculate next version
115+
env:
116+
LATEST_TAG: ${{ env.latest_tag }}
117+
EVENT_NAME: ${{ github.event_name }}
118+
VERSION_BUMP: ${{ inputs.version_bump }}
113119
run: |
114-
echo "Latest tag: ${{ env.latest_tag }}"
115-
IFS='.' read -r major minor patch <<< "${{ env.latest_tag }}"
120+
echo "Latest tag: $LATEST_TAG"
121+
IFS='.' read -r major minor patch <<< "$LATEST_TAG"
116122
117-
if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
118-
if [[ "${{ inputs.version_bump }}" == "patch" ]]; then
123+
if [[ "$EVENT_NAME" == "workflow_dispatch" ]]; then
124+
if [[ "$VERSION_BUMP" == "patch" ]]; then
119125
patch=$((patch + 1))
120126
else
121127
minor=$((minor + 1))
@@ -138,21 +144,22 @@ jobs:
138144
echo "new_tag=$new_tag" >> $GITHUB_ENV
139145
140146
- name: Create and Push Tag
147+
env:
148+
NEW_TAG: ${{ env.new_tag }}
149+
GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }}
141150
run: |
142151
git config user.name "github-actions[bot]"
143152
git config user.email "github-actions[bot]@users.noreply.github.com"
144-
git tag ${{ env.new_tag }} -a -m "Release ${{ env.new_tag }}"
145-
git push origin ${{ env.new_tag }}
146-
env:
147-
GITHUB_TOKEN: ${{ secrets.LAZYGIT_RELEASE_PAT }}
153+
git tag "$NEW_TAG" -a -m "Release $NEW_TAG"
154+
git push origin "$NEW_TAG"
148155
149156
- name: Setup Go
150157
uses: actions/setup-go@v6
151158
with:
152159
go-version: 1.25.x
153160

154161
- name: Run goreleaser
155-
uses: goreleaser/goreleaser-action@v6
162+
uses: goreleaser/goreleaser-action@ec59f474b9834571250b370d4735c50f8e2d1e29 # v7.0.0
156163
with:
157164
distribution: goreleaser
158165
version: v2

‎.github/workflows/sponsors.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@ jobs:
1313
uses: actions/checkout@v6
1414

1515
- name: Generate Sponsors 💖
16-
uses: JamesIves/github-sponsors-readme-action@v1.2.2
16+
uses: JamesIves/github-sponsors-readme-action@2fd9142e765f755780202122261dc85e78459405 # v1.6.0
1717
with:
1818
token: ${{ secrets.SPONSORS_TOKEN }}
1919
file: "README.md"
2020

2121
- name: Create Pull Request 🚀
22-
uses: peter-evans/create-pull-request@v8
22+
uses: peter-evans/create-pull-request@c0f553fe549906ede9cf27b5156039d195d2ece0 # v8
2323
with:
2424
commit-message: "README.md: Update Sponsors"
2525
title: "README.md: Update Sponsors"

‎CONTRIBUTING.md‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ welcome your pull requests:
3131

3232
1. Fork the repo and create your branch from `master`.
3333
2. If you've added code that should be tested, add tests.
34-
3. If you've added code that need documentation, update the documentation.
34+
3. If you've added code that needs documentation, update the documentation.
3535
4. Write a [good commit message](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
3636
5. Issue that pull request!
3737

@@ -49,6 +49,12 @@ In particular:
4949
- Strive for minimal commits; every change that is independent from other changes should be in a commit of its own (with a good commit message that explains why the change is made).
5050
- When you need to iterate over your implementation during review (e.g. because you discovered a bug, or a maintainer requested changes), don't just pile new commits on top. Use fixup commits to make your changes transparent while still maintaining a good commit history. If you don't know what that means, [here's a brief introduction](docs/Fixup_Commits.md).
5151

52+
## A note about AI
53+
54+
It has become common recently to throw an issue at a coding agent and submit whatever comes out of it as a PR. This is not appreciated here, and I will close PRs where I can tell this was the case, or where I even suspect it was the case.
55+
56+
Some of these PRs may actually be good and useful, but many are not, and it's not a good use of my time as a maintainer to look at generated PRs to decide. This is the job of the PR's contributor, and if you don't speak enough go or can't be bothered to get familiar enough with lazygit's codebase to tell, then don't contribute the PR.
57+
5258
## Running in a VSCode dev container
5359

5460
If you want to spare yourself the hassle of setting up your dev environment yourself (i.e. installing Go, extensions, and extra tools), you can run the Lazygit code in a VSCode dev container like so:

0 commit comments

Comments
 (0)