From 9e1965d28b1a45b089460fcb5fb2b1bba3829574 Mon Sep 17 00:00:00 2001 From: Gaukas Wang Date: Sat, 5 Aug 2023 13:04:13 -0600 Subject: [PATCH] bug: ci taking too long to run (#7) * breaking: separate CI build and test workflows Separate CI build and test into individual workflows. Add matrix-based CI build and test for better coverage. Update build status badges. * fix: ginko_test format and condition --- .github/workflows/ginkgo_test.yml | 42 +++++++++++++++++++++++++++++++ .github/workflows/go1.20.yml | 27 -------------------- .github/workflows/go1.21.yml | 27 -------------------- .github/workflows/go_build.yml | 23 +++++++++++++++++ README.md | 4 +-- 5 files changed, 67 insertions(+), 56 deletions(-) create mode 100644 .github/workflows/ginkgo_test.yml delete mode 100644 .github/workflows/go1.20.yml delete mode 100644 .github/workflows/go1.21.yml create mode 100644 .github/workflows/go_build.yml diff --git a/.github/workflows/ginkgo_test.yml b/.github/workflows/ginkgo_test.yml new file mode 100644 index 00000000..b6d0021b --- /dev/null +++ b/.github/workflows/ginkgo_test.yml @@ -0,0 +1,42 @@ +# This workflow was based on quic-go's unit.yml + +name: "Ginkgo Unit Tests" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: [ "ubuntu-latest", "windows-latest", "macos-latest" ] + go: [ "1.20.x", "1.21.0-rc.4" ] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go }} + - run: go version + + - name: Run tests + env: + TIMESCALE_FACTOR: 10 + run: go run github.com/onsi/ginkgo/v2/ginkgo -r -v -cover -randomize-all -randomize-suites -trace -skip-package integrationtests + + - name: Run tests (32 bit) + if: ${{ matrix.os != 'macos' }} # can't run 32 bit tests on OSX. + env: + TIMESCALE_FACTOR: 10 + GOARCH: 386 + run: go run github.com/onsi/ginkgo/v2/ginkgo -r -v -cover -coverprofile coverage.txt -output-dir . -randomize-all -randomize-suites -trace -skip-package integrationtests + + - name: Run tests with race detector + if: ${{ matrix.os == 'ubuntu' }} # speed things up. Windows and OSX VMs are slow + env: + TIMESCALE_FACTOR: 20 + run: go run github.com/onsi/ginkgo/v2/ginkgo -r -v -race -randomize-all -randomize-suites -trace -skip-package integrationtests \ No newline at end of file diff --git a/.github/workflows/go1.20.yml b/.github/workflows/go1.20.yml deleted file mode 100644 index af76a6b2..00000000 --- a/.github/workflows/go1.20.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This workflow will build a golang project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go - -name: "Go 1.20" - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build_and_test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.20' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test -v ./... \ No newline at end of file diff --git a/.github/workflows/go1.21.yml b/.github/workflows/go1.21.yml deleted file mode 100644 index 0773c71a..00000000 --- a/.github/workflows/go1.21.yml +++ /dev/null @@ -1,27 +0,0 @@ -# This workflow will build a golang project -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go - -name: "Go 1.21rc4" - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - -jobs: - build_and_test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: '1.21.0-rc.4' - - - name: Build - run: go build -v ./... - - - name: Test - run: go test -v ./... \ No newline at end of file diff --git a/.github/workflows/go_build.yml b/.github/workflows/go_build.yml new file mode 100644 index 00000000..9fcd6cd6 --- /dev/null +++ b/.github/workflows/go_build.yml @@ -0,0 +1,23 @@ +# This workflow will build a golang project +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-go + +name: "Go Build" + +on: [push, pull_request] + +jobs: + build: + strategy: + fail-fast: false + matrix: + os: [ "ubuntu-latest", "windows-latest", "macos-latest" ] + go: [ "1.20.x", "1.21.0-rc.4" ] + runs-on: ${{ matrix.os }} + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v4 + with: + go-version: ${{ matrix.go }} + - run: go version + - name: Build + run: go build -v ./... \ No newline at end of file diff --git a/README.md b/README.md index 1ec8cf6f..70bd7aac 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # ![uTLS](docs/utls_logo_small.png) drawing uQUIC -[![Build Status](https://github.com/refraction-networking/uquic/actions/workflows/go1.20.yml/badge.svg?branch=master)](https://github.com/gaukas/uquic/actions/workflows/go1.20.yml) -[![Build Status](https://github.com/refraction-networking/uquic/actions/workflows/go1.21.yml/badge.svg?branch=master)](https://github.com/gaukas/uquic/actions/workflows/go1.21.yml) +[![Go Build Status](https://github.com/gaukas/uquic/actions/workflows/go_build.yml/badge.svg?branch=master)](https://github.com/gaukas/uquic/actions/workflows/go_build.yml) +[![Ginkgo Test Status](https://github.com/gaukas/uquic/actions/workflows/ginkgo_test.yml/badge.svg?branch=master)](https://github.com/gaukas/uquic/actions/workflows/ginkgo_test.yml) [![godoc](https://img.shields.io/badge/godoc-reference-blue.svg)](https://godoc.org/github.com/refraction-networking/uquic) --- uQUIC is a fork of [quic-go](https://github.com/refraction-networking/uquic), which provides Initial Packet fingerprinting resistance and other features. While the handshake is still performed by quic-go, this library provides interface to customize the unencrypted Initial Packet which may reveal fingerprint-able information.