Skip to content

Commit

Permalink
ci: rename travis -> ci and modify CI docs
Browse files Browse the repository at this point in the history
- now that GH Actions are merged, thoroughly tested, and working:
  - rename `travis` dir to `ci` dir instead
  - update `release.md` to remove Travis references and reference GH Actions files instead
    - and just generic "ci build" instead of "travis build"
    - CI is working now, so uncomment/unquote the previous numbers

- leave `cp_to_travis` and `reverse_ssh_tunnel` as is for now, in case Sylvain wants to adapt them to GH Actions
  - I'm not sure they'll work as-is on GH Actions (e.g. `travis_base` won't exist), so they may need further modification
    - (or it may not be possible at all with GH Actions to do reverse SSH)
    - that is beyond my scope since I'm not using these, don't have a bounce host, and am developing on a Mac locally
  • Loading branch information
agilgur5 committed Aug 28, 2022
1 parent 94099bb commit 40504cf
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 26 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ jobs:
run: |
bash --version ; type bash
# hack for speedup on mac build with our own bash5
./travis/get_bash5_macos.sh
./travis/get_bats-core.sh
./ci/get_bash5_macos.sh
./ci/get_bats-core.sh
go get github.com/docopt/docopt-go
# get our official repos too
go get github.com/docopt/docopts
Expand All @@ -38,4 +38,4 @@ jobs:
# For debugging, create reverse SSH tunnel (this should be run on failure too)
# - name: Debug
# if: runner.os == "macOS"
# run: bash -x ./travis/reverse_ssh_tunnel.sh
# run: bash -x ./ci/reverse_ssh_tunnel.sh
2 changes: 1 addition & 1 deletion travis/cp_to_travis.sh → ci/cp_to_travis.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
#
# Usage: ./travis/cp_to_travis.sh LOCAL_FILENAME
# Usage: ./ci/cp_to_travis.sh LOCAL_FILENAME
#
# require: a bounce host MUST be set before!

Expand Down
1 change: 0 additions & 1 deletion travis/get_bash5_macos.sh → ci/get_bash5_macos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,5 @@ type bash
MY_BASH_VERSINFO=$(bash --version | sed -n -e '1 s/^.*version \([0-9.]\{1,\}\).*/\1/ p')
if [[ ! $MY_BASH_VERSINFO =~ ^[4-9] ]] ; then
echo "install bash5 failed"
# ./travis/reverse_ssh_tunnel.sh
exit 1
fi
File renamed without changes.
3 changes: 1 addition & 2 deletions travis/reverse_ssh_tunnel.sh → ci/reverse_ssh_tunnel.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
#!/usr/bin/env bash
#
# Usage: add this line to .travis.yml at the end of the script: section
# - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then bash -x ./travis/reverse_ssh_tunnel.sh ; fi
# Usage: uncomment the reverse_ssh_tunnel lines in .github/workflows/ci.yml at the bottom of the file
# required: a bounce host MUST be set before!
# NOTE: ansible playbook to build the bounce_host not provided yet.

Expand Down
37 changes: 18 additions & 19 deletions docs/release.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,24 @@ git checkout master
git commit -a
```

TRAVIS CI is gone, #54
> ## 5. push on origin for a travis build
>
> ```
> git push origin master
> ```
>
> ## 6. remove travis hack macos if any
>
> ```
> sed -i -e '/travis.reverse_ssh_tunnel.sh/ s/^\([^#]\)/#\1/' .travis.yml
> ```
>
> ## 7. push on docopts for a travis build
>
> ```
> git commit -a
> git push docopts master
> ```
## 5. push on origin for a ci build

```
git push origin master
```

## 6. remove reverse ssh hack macos if any

```
sed -i -e '/ci.reverse_ssh_tunnel.sh/ s/^\([^#]\)/#\1/' .github/workflows/ci.yml
```

## 7. push on docopts for a ci build

```
git commit -a
git push docopts master
```

## 8. tag the new release

Expand Down

0 comments on commit 40504cf

Please sign in to comment.