Skip to content

Commit 2c0b460

Browse files
committed
ci: clean up legacy helpers
1 parent 9d9853f commit 2c0b460

File tree

5 files changed

+12
-122
lines changed

5 files changed

+12
-122
lines changed

.github/workflows/containers.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ jobs:
2929
with:
3030
go-version: ${{ env['GO_TOOLCHAIN'] }}
3131
- name: Go build (source)
32-
run: ./scripts/travis/pr-test.sh build_source
32+
run: ./scripts/ci-runner.sh build_source
3333
- name: Go build (tests)
34-
run: ./scripts/travis/pr-test.sh build_tests
34+
run: ./scripts/ci-runner.sh build_tests
3535
- name: Pull base image - ${{ matrix.baseimage }}
3636
run: docker pull ${{ matrix.baseimage }}
3737
- name: Install packages for ${{ matrix.baseimage }}
@@ -44,6 +44,6 @@ jobs:
4444
- name: Wait a bit for the whole system to settle
4545
run: sleep 30s
4646
- name: Run tests
47-
run: docker exec --privileged `cat /tmp/cidfile` /bin/bash -c "cd ${BUILD_DIR} && ./scripts/travis/pr-test.sh run_tests"
47+
run: docker exec --privileged `cat /tmp/cidfile` /bin/bash -c "cd ${BUILD_DIR} && ./scripts/ci-runner.sh run_tests"
4848
- name: Cleanup
4949
run: docker kill `cat /tmp/cidfile`

.github/workflows/go.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
with:
2828
go-version: ${{ matrix.go }}
2929
- name: Go fmt
30-
run: ./scripts/travis/pr-test.sh go_fmt
30+
run: ./scripts/ci-runner.sh go_fmt
3131
- name: Go build (source)
32-
run: ./scripts/travis/pr-test.sh build_source
32+
run: ./scripts/ci-runner.sh build_source
3333
- name: Go build (tests)
34-
run: ./scripts/travis/pr-test.sh build_tests
34+
run: ./scripts/ci-runner.sh build_tests
3535
- name: Go vet
36-
run: ./scripts/travis/pr-test.sh go_vet
36+
run: ./scripts/ci-runner.sh go_vet
3737
build-minimum:
3838
name: "Build on minimum supported toolchain"
3939
runs-on: ubuntu-latest
@@ -47,10 +47,10 @@ jobs:
4747
with:
4848
go-version: ${{ env['ACTION_MINIMUM_TOOLCHAIN'] }}
4949
- name: Go fmt
50-
run: ./scripts/travis/pr-test.sh go_fmt
50+
run: ./scripts/ci-runner.sh go_fmt
5151
- name: Go build (source)
52-
run: ./scripts/travis/pr-test.sh build_source
52+
run: ./scripts/ci-runner.sh build_source
5353
- name: Go build (tests)
54-
run: ./scripts/travis/pr-test.sh build_tests
54+
run: ./scripts/ci-runner.sh build_tests
5555
- name: Go vet
56-
run: ./scripts/travis/pr-test.sh go_vet
56+
run: ./scripts/ci-runner.sh go_vet

scripts/travis/pr-test.sh renamed to scripts/ci-runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ case "$subcommand" in
103103
;;
104104

105105
* )
106-
echo "Error: unrecognized subcommand."
106+
echo "Error: unrecognized subcommand (hint: try with 'run_tests')."
107107
exit 1
108108
;;
109109
esac

scripts/jenkins/periodic-go-systemd-builder.sh

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

test

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

0 commit comments

Comments
 (0)