Skip to content

Commit b8b7b7f

Browse files
ingydotnetadmorgan
authored andcommitted
Support GitHub actions testing...
...and remove Travis-CI testing
1 parent fc7486e commit b8b7b7f

File tree

7 files changed

+39
-55
lines changed

7 files changed

+39
-55
lines changed

.github/workflows/test.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Test
2+
3+
on:
4+
push:
5+
branches: [ '*' ]
6+
pull_request:
7+
branches: [ '*' ]
8+
9+
jobs:
10+
test:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os: [ubuntu-latest, macos-latest]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
- if: startsWith(matrix.os, 'macos')
19+
run: brew install bash
20+
- run:
21+
git checkout -B git-actions-ci-dummy-branch;
22+
git config --global user.email "[email protected]";
23+
git config --global user.name "Your Name";
24+
- run: make test

.travis.yml

-32
This file was deleted.

Intro.pod

+1-4
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,10 @@ Good:
307307

308308
=item * Bash code is very simple and easy to follow.
309309

310-
=item * Comprehensive test suite. Currently passing on travis:
310+
=item * Comprehensive test suite.
311311

312312
=back
313313

314-
=for html
315-
<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
316-
317314
Bad:
318315

319316
=over

ReadMe.pod

+12-13
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ See http://github.com/ingydotnet/swim-pm#readme
1010

1111
git-subrepo - Git Submodule Alternative
1212

13-
=for html
14-
<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
15-
1613
=head1 Synopsis
1714

1815
git subrepo -h # Help Overview
@@ -181,7 +178,7 @@ performed. The default option is merge.
181178

182179
The C<init> command accepts the C<--branch=> and C<--remote=> options.
183180

184-
=item C<< git subrepo pull <subdir>|--all [-M|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
181+
=item C<< git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
185182

186183
Update the subrepo subdir with the latest upstream changes.
187184

@@ -215,7 +212,7 @@ used for a subrepo C<push> command. See 'push' below for more information. If
215212
you want to change the method you can use the C<config> command for this.
216213

217214
When you pull you can assume a fast-forward strategy (default) or you can
218-
specify a C<--method rebase>, C<--method merge> or C<--force> strategy. The latter is the
215+
specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
219216
same as a C<clone --force> operation, using the current remote and branch.
220217

221218
Like the C<clone> command, C<pull> will squash all the changes (since the last
@@ -229,7 +226,7 @@ The set of commands used above are described in detail below.
229226
The C<pull> command accepts the C<--all>, C<--branch=>, C<--edit>, C<--force>,
230227
C<--message=>, C<--remote=> and C<--update> options.
231228

232-
=item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M] [-u] [-f] [-s] [-N] >>
229+
=item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N] >>
233230

234231
Push a properly merged subrepo branch back upstream.
235232

@@ -254,7 +251,7 @@ discouraged. Only use this option if you fully understand it. (The C<--force>
254251
option will NOT check for a proper merge. ANY branch will be force pushed!)
255252

256253
The C<push> command accepts the C<--all>, C<--branch=>, C<--dry-run>, C<--
257-
force>, C<--method>, C<--remote=>, C<--squash> and C<--
254+
force>, C<--merge>, C<--rebase>, C<--remote=>, C<--squash> and C<--
258255
update> options.
259256

260257
=item C<< git subrepo fetch <subdir>|--all [-r <remote>] [-b <branch>] >>
@@ -426,18 +423,20 @@ Use this option to force certain commands that fail in the general case.
426423
NOTE: The C<--force> option means different things for different commands.
427424
Read the command specific doc for the exact meaning.
428425

429-
=item C<--method=<rebase|merge>> (C<-M>)
430-
431-
C<merge>: Use a C<merge> strategy to include upstream subrepo commits on a pull
432-
(or setup for push).
426+
=item C<--merge> (C<-M>)
433427

434-
C<rebase>: Use a C<rebase> strategy to include upstream subrepo commits on a
435-
pull (or setup for push).
428+
Use a C<merge> strategy to include upstream subrepo commits on a pull (or
429+
setup for push).
436430

437431
=item C<< --message=<message> >> (C<< -m <message> >>)
438432

439433
Specify your own commit message on the command line.
440434

435+
=item C<--rebase> (C<-R>)
436+
437+
Use a C<rebase> strategy to include upstream subrepo commits on a pull (or
438+
setup for push).
439+
441440
=item C<< --remote=<remote-url> >> (C<< -r <remote-url> >>)
442441

443442
Use a different remote-url than the one saved in C<.gitrepo> locally.

doc/git-subrepo.swim

-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ git-subrepo
33

44
Git Submodule Alternative
55

6-
<badge travis ingydotnet/git-subrepo>
7-
86
= Synopsis
97

108
git subrepo -h # Help Overview

doc/intro-to-subrepo.swim

+1-3
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,7 @@ Good:
227227
* Pushed history is kept intact.
228228
* Creates a clean historical view. (See below)
229229
* Bash code is very simple and easy to follow.
230-
* Comprehensive test suite. Currently passing on travis:
231-
232-
<badge travis ingydotnet/git-subrepo>
230+
* Comprehensive test suite.
233231

234232
Bad:
235233

man/man1/git-subrepo.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
.\" ========================================================================
7272
.\"
7373
.IX Title "STDIN 1"
74-
.TH STDIN 1 "January 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
74+
.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
7575
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
7676
.\" way too many mistakes in technical documents.
7777
.if n .ad l

0 commit comments

Comments
 (0)