Support GitHub actions testing...

...and remove Travis-CI testing
ingydotnet · Nov 17, 2020 · 1fb7d3f · 1fb7d3f
1 parent fc7486e
commit 1fb7d3f
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 55 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,24 @@
+name: Test
+
+on:
+  push:
+    branches: [ '*' ]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+    - if: startsWith(matrix.os, 'macos')
+      run: brew install bash
+    - run:
+        git checkout -B git-actions-ci-dummy-branch
+        git config --global user.email "you@example.com";
+        git config --global user.name "Your Name";
+    - run: make test
diff --git a/.travis.yml b/.travis.yml
diff --git a/Intro.pod b/Intro.pod
@@ -307,13 +307,10 @@ Good:
 
 =item * Bash code is very simple and easy to follow.
 
-=item * Comprehensive test suite. Currently passing on travis:
+=item * Comprehensive test suite.
 
 =back
 
-=for html
-<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
-
 Bad:
 
 =over

diff --git a/ReadMe.pod b/ReadMe.pod
@@ -10,9 +10,6 @@ See http://github.com/ingydotnet/swim-pm#readme
 
 git-subrepo - Git Submodule Alternative
 
-=for html
-<a href="https://travis-ci.org/ingydotnet/git-subrepo"><img src="https://travis-ci.org/ingydotnet/git-subrepo.png" alt="git-subrepo"></a>
-
 =head1 Synopsis
 
     git subrepo -h    # Help Overview
@@ -181,7 +178,7 @@ performed. The default option is merge.
 
 The C<init> command accepts the C<--branch=> and C<--remote=> options.
 
-=item C<< git subrepo pull <subdir>|--all [-M|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
+=item C<< git subrepo pull <subdir>|--all [-M|-R|-f] [-m <msg>] [-e] [-b <branch>] [-r <remote>] [-u] >>
 
 Update the subrepo subdir with the latest upstream changes.
 
@@ -215,7 +212,7 @@ used for a subrepo C<push> command. See 'push' below for more information. If
 you want to change the method you can use the C<config> command for this.
 
 When you pull you can assume a fast-forward strategy (default) or you can
-specify a C<--method rebase>, C<--method merge> or C<--force> strategy. The latter is the
+specify a C<--rebase>, C<--merge> or C<--force> strategy. The latter is the
 same as a C<clone --force> operation, using the current remote and branch.
 
 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.
 The C<pull> command accepts the C<--all>, C<--branch=>, C<--edit>, C<--force>,
 C<--message=>, C<--remote=> and C<--update> options.
 
-=item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M] [-u] [-f] [-s] [-N] >>
+=item C<< git subrepo push <subdir>|--all [<branch>] [-r <remote>] [-b <branch>] [-M|-R] [-u] [-f] [-s] [-N] >>
 
 Push a properly merged subrepo branch back upstream.
 
@@ -254,7 +251,7 @@ discouraged. Only use this option if you fully understand it. (The C<--force>
 option will NOT check for a proper merge. ANY branch will be force pushed!)
 
 The C<push> command accepts the C<--all>, C<--branch=>, C<--dry-run>, C<--
-force>, C<--method>, C<--remote=>, C<--squash> and C<--
+force>, C<--merge>, C<--rebase>, C<--remote=>, C<--squash> and C<--
 update> options.
 
 =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.
 NOTE: The C<--force> option means different things for different commands.
       Read the command specific doc for the exact meaning.
 
-=item C<--method=<rebase|merge>> (C<-M>)
-
-C<merge>: Use a C<merge> strategy to include upstream subrepo commits on a pull
-(or setup for push).
+=item C<--merge> (C<-M>)
 
-C<rebase>: Use a C<rebase> strategy to include upstream subrepo commits on a
-pull (or setup for push).
+Use a C<merge> strategy to include upstream subrepo commits on a pull (or
+setup for push).
 
 =item C<< --message=<message> >> (C<< -m <message> >>)
 
 Specify your own commit message on the command line.
 
+=item C<--rebase> (C<-R>)
+
+Use a C<rebase> strategy to include upstream subrepo commits on a pull (or
+setup for push).
+
 =item C<< --remote=<remote-url> >> (C<< -r <remote-url> >>)
 
 Use a different remote-url than the one saved in C<.gitrepo> locally.

diff --git a/doc/git-subrepo.swim b/doc/git-subrepo.swim
@@ -3,8 +3,6 @@ git-subrepo
 
 Git Submodule Alternative
 
-<badge travis ingydotnet/git-subrepo>
-
 = Synopsis
 
   git subrepo -h    # Help Overview

diff --git a/doc/intro-to-subrepo.swim b/doc/intro-to-subrepo.swim
@@ -227,9 +227,7 @@ Good:
 * Pushed history is kept intact.
 * Creates a clean historical view. (See below)
 * Bash code is very simple and easy to follow.
-* Comprehensive test suite. Currently passing on travis:
-
-<badge travis ingydotnet/git-subrepo>
+* Comprehensive test suite.
 
 Bad:
 

diff --git a/man/man1/git-subrepo.1 b/man/man1/git-subrepo.1
@@ -71,7 +71,7 @@
 .\" ========================================================================
 .\"
 .IX Title "STDIN 1"
-.TH STDIN 1 "January 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
+.TH STDIN 1 "November 2020" "Generated by Swim v0.1.48" "Git Submodule Alternative"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l