Skip to content

Commit d2b6785

Browse files
znerolznerol
authored
Merge pull request #25 from znerol/develop
Merge develop into main
2 parents 5bf6891 + 94b6e08 commit d2b6785

20 files changed

+416
-79
lines changed

‎.github/workflows/do-integration-test.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
name: Run integration tests
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
workflow_call:
7+
secrets:
8+
GAU_SSH_PRIVKEY:
9+
required: true
10+
11+
jobs:
12+
integration-test:
13+
runs-on: ubuntu-latest
14+
15+
permissions:
16+
contents: read
17+
18+
steps:
19+
- name: Checkout repository
20+
uses: actions/checkout@v4
21+
22+
- name: Install dependencies
23+
run: |
24+
sudo apt-get update
25+
sudo apt-get install pandoc
26+
27+
- name: Build dist tarball
28+
run: |
29+
make dist
30+
31+
- name: Run integration tests
32+
env:
33+
GAU_SSH_PRIVKEY: "${{ secrets.GAU_SSH_PRIVKEY }}"
34+
run: |
35+
make -C integration-test image
36+
make -C integration-test all

‎.github/workflows/do-lint.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Run linters on code base
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
workflow_call:
7+
8+
jobs:
9+
lint:
10+
runs-on: ubuntu-latest
11+
12+
permissions:
13+
contents: read
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Run shellcheck
20+
run: make lint

‎.github/workflows/do-unit-test.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
name: Run unit tests on code base
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
workflow_call:
7+
8+
jobs:
9+
unit-test:
10+
runs-on: ubuntu-latest
11+
12+
permissions:
13+
contents: read
14+
15+
steps:
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Set up python
20+
uses: actions/setup-python@v5
21+
with:
22+
python-version: '3.x'
23+
24+
- name: Install dependencies
25+
run: |
26+
python -m pip install --upgrade pip
27+
pip install python-dateutil
28+
29+
- name: Run unit tests
30+
run: make python=python3 test

‎.github/workflows/on-pull-request.yml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Run Tests (Pull Request)
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
pull_request:
7+
8+
jobs:
9+
lint:
10+
uses: ./.github/workflows/do-lint.yml
11+
12+
unit-test:
13+
uses: ./.github/workflows/do-unit-test.yml
14+
15+
integration-test:
16+
uses: ./.github/workflows/do-integration-test.yml
17+
secrets: inherit

‎.github/workflows/on-push.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
name: Run Tests (Push)
3+
4+
# yamllint disable-line rule:truthy
5+
on:
6+
push:
7+
branches:
8+
- main
9+
- develop
10+
11+
jobs:
12+
lint:
13+
uses: ./.github/workflows/do-lint.yml
14+
15+
unit-test:
16+
uses: ./.github/workflows/do-unit-test.yml
17+
18+
integration-test:
19+
uses: ./.github/workflows/do-integration-test.yml
20+
secrets: inherit

‎.travis.yml‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎CHANGELOG.md‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77
## [Unreleased]
88
### Changed
99

10+
## [1.4.0] - 2024-09-18
11+
### Added
12+
- feat(ac,at): Capture output from stderr (#23)
13+
- feat(ci): Replace travis with GH actions (#21)
14+
- feat(tag-expiry): Add tag expiry command (#18)
15+
16+
### Changed
17+
- fix(ci): Ensure that tests work without author config (#22)
18+
1019
## [1.3.0] - 2021-03-14
1120
### Added
1221
- feat(at): Add auto tag command (#15)
@@ -32,7 +41,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3241
### Added
3342
- Initial release.
3443

35-
[Unreleased]: https://github.com/znerol/git-gau/compare/v1.3.0...HEAD
44+
[Unreleased]: https://github.com/znerol/git-gau/compare/v1.4.0...HEAD
45+
[1.4.0]: https://github.com/znerol/git-gau/compare/v1.3.0...v1.4.0
3646
[1.3.0]: https://github.com/znerol/git-gau/compare/v1.2.1...v1.3.0
3747
[1.2.1]: https://github.com/znerol/git-gau/compare/v1.2.0...v1.2.1
3848
[1.2.0]: https://github.com/znerol/git-gau/compare/v1.1.0...v1.2.0

‎Makefile‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ lint: bin
3434
shellcheck bin/git-gau-autoclean
3535
shellcheck bin/git-gau-automerge
3636
shellcheck bin/git-gau-exec
37+
shellcheck bin/git-gau-tag-expiry
3738
shellcheck bin/git-gau-xargs
3839
shellcheck lib/docker-entry
3940
shellcheck lib/docker-entry.d/50-git-credentials
@@ -50,6 +51,7 @@ doc: \
5051
doc/git-gau-automerge.1 \
5152
doc/git-gau-docker-entry.1 \
5253
doc/git-gau-exec.1 \
54+
doc/git-gau-tag-expiry.1 \
5355
doc/git-gau-xargs.1
5456

5557
clean:
@@ -59,6 +61,7 @@ clean:
5961
-rm -f doc/git-gau-automerge.1
6062
-rm -f doc/git-gau-docker-entry.1
6163
-rm -f doc/git-gau-exec.1
64+
-rm -f doc/git-gau-tag-expiry.1
6265
-rm -f doc/git-gau-xargs.1
6366
-rm -rf dist
6467
-rm -rf build
@@ -70,6 +73,7 @@ install-doc: doc
7073
install -m 0644 -D doc/git-gau-automerge.1 $(DESTDIR)$(mandir)/man1/git-gau-automerge.1
7174
install -m 0644 -D doc/git-gau-docker-entry.1 $(DESTDIR)$(mandir)/man1/git-gau-docker-entry.1
7275
install -m 0644 -D doc/git-gau-exec.1 $(DESTDIR)$(mandir)/man1/git-gau-exec.1
76+
install -m 0644 -D doc/git-gau-tag-expiry.1 $(DESTDIR)$(mandir)/man1/git-gau-tag-expiry.1
7377
install -m 0644 -D doc/git-gau-xargs.1 $(DESTDIR)$(mandir)/man1/git-gau-xargs.1
7478

7579
install-bin: bin
@@ -78,6 +82,7 @@ install-bin: bin
7882
install -m 0755 -D bin/git-gau-autoclean $(DESTDIR)$(bindir)/git-gau-autoclean
7983
install -m 0755 -D bin/git-gau-automerge $(DESTDIR)$(bindir)/git-gau-automerge
8084
install -m 0755 -D bin/git-gau-exec $(DESTDIR)$(bindir)/git-gau-exec
85+
install -m 0755 -D bin/git-gau-tag-expiry $(DESTDIR)$(bindir)/git-gau-tag-expiry
8186
install -m 0755 -D bin/git-gau-xargs $(DESTDIR)$(bindir)/git-gau-xargs
8287
install -m 0755 -D lib/docker-entry $(DESTDIR)$(libdir)/git-gau/docker-entry
8388
install -m 0755 -D lib/docker-entry.d/50-git-credentials $(DESTDIR)$(libdir)/git-gau/docker-entry.d/50-git-credentials
@@ -92,6 +97,7 @@ uninstall:
9297
-rm -f $(DESTDIR)$(bindir)/git-gau-autoclean
9398
-rm -f $(DESTDIR)$(bindir)/git-gau-automerge
9499
-rm -f $(DESTDIR)$(bindir)/git-gau-exec
100+
-rm -f $(DESTDIR)$(bindir)/git-gau-tag-expiry
95101
-rm -f $(DESTDIR)$(bindir)/git-gau-xargs
96102
-rm -f $(DESTDIR)$(libdir)/git-gau/docker-entry
97103
-rm -f $(DESTDIR)$(libdir)/git-gau/docker-entry.d/50-git-credentials
@@ -103,6 +109,7 @@ uninstall:
103109
-rm -f $(DESTDIR)$(mandir)/man1/git-gau-automerge.1
104110
-rm -f $(DESTDIR)$(mandir)/man1/git-gau-docker-entry.1
105111
-rm -f $(DESTDIR)$(mandir)/man1/git-gau-exec.1
112+
-rm -f $(DESTDIR)$(mandir)/man1/git-gau-tag-expiry.1
106113
-rm -f $(DESTDIR)$(mandir)/man1/git-gau-xargs.1
107114

108115
dist-bin:

‎README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
A collection of custom git commands which make it easier to create bots which
44
commit and push changes automatically.
55

6-
[![Build Status](https://travis-ci.com/znerol/git-gau.svg?branch=develop)](https://travis-ci.com/znerol/git-gau)
7-
86
## INSTALL
97

108
Navigate to the releases page and pick the latest `git-gau-dist.tar.gz`

‎bin/git-gau-ac‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ ${MKFIFO} "${LOGFIFO}"
3636
${TEE} "${LOGFILE}" < "${LOGFIFO}" &
3737

3838
# Run command and record commit message.
39-
"${@}" > "${LOGFIFO}"
39+
"${@}" > "${LOGFIFO}" 2>&1
4040

4141
# Record changes to files.
4242
${ECHO} "${GAU_ADD_ARGS:---all}" | ${XARGS} ${GIT} add

0 commit comments

Comments
 (0)