diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 6b2897e2..c88b2e9f 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -7,57 +7,21 @@ on: pull_request: jobs: - gh-285: - runs-on: ubuntu-latest - timeout-minutes: 15 - env: - CI: "true" - MYSQL_VERSION: "8.0" - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-go@v5 - with: - go-version: 1.16 - - - name: Starting up MySQL - run: .github/workflows/start-mysql.sh - - - name: Running GH-285 test - run: ./examples/gh-285/bugreport.sh + tests: + matrix: + mysql: ["5.7", "8.0"] - go-test: runs-on: ubuntu-latest timeout-minutes: 15 env: CI: "true" - MYSQL_VERSION: "8.0" - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-go@v5 - with: - go-version: 1.16 + MYSQL_VERSION: ${{ matrix.mysql }} - - name: Starting up MySQL - run: .github/workflows/start-mysql.sh - - - name: Running Golang tests - run: make test-go - - ruby-test: - runs-on: ubuntu-latest - timeout-minutes: 15 - env: - CI: "true" - BUNDLE_WITHOUT: "development" - MYSQL_VERSION: "8.0" steps: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: 1.16 - - uses: ruby/setup-ruby@v1 with: ruby-version: 3.2 @@ -66,8 +30,11 @@ jobs: - name: Starting up MySQL run: .github/workflows/start-mysql.sh - - name: Running Ruby tests - run: bundle exec ruby test/main.rb + - name: Running Golang tests + run: make test-go + + - name: Running GH-285 test + run: ./examples/gh-285/bugreport.sh build-debs: strategy: @@ -76,7 +43,6 @@ jobs: runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v5 with: go-version: 1.16 @@ -87,25 +53,6 @@ jobs: - name: Upload debs uses: actions/upload-artifact@v4 with: - name: debs-${{ github.sha }} + name: debs-${{ github.sha }}-${{ matrix.runner }} path: build/ghostferry* - checksum-debs: - runs-on: ubuntu-latest - needs: build-debs - steps: - - name: Fetch uploaded artifacts - uses: actions/download-artifact@v4 - with: - name: debs-${{ github.sha }} - - name: shasum - shell: bash - run: | - sha256sum *.deb > ghostferry-$GITHUB_SHA.sha256sum - echo "sha256sum:" - cat ghostferry-$GITHUB_SHA.sha256sum - - name: Upload checksum - uses: actions/upload-artifact@v4 - with: - name: debs-${{ github.sha }} - path: "*.sha256sum" diff --git a/.github/workflows/tests_5.7.yml b/.github/workflows/tests_5.7.yml deleted file mode 100644 index 899e2868..00000000 --- a/.github/workflows/tests_5.7.yml +++ /dev/null @@ -1,72 +0,0 @@ -name: Ghostferry MySQL 5.7 tests - -on: - push: - branches: - - main - pull_request: - -jobs: - gh-285: - runs-on: ubuntu-latest - timeout-minutes: 15 - env: - CI: "true" - MYSQL_VERSION: "5.7" - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-go@v5 - with: - go-version: 1.16 - - - name: Starting up MySQL - run: .github/workflows/start-mysql.sh - - - name: Running GH-285 test - run: ./examples/gh-285/bugreport.sh - - go-test: - runs-on: ubuntu-latest - timeout-minutes: 15 - env: - CI: "true" - MYSQL_VERSION: "5.7" - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-go@v5 - with: - go-version: 1.16 - - - name: Starting up MySQL - run: .github/workflows/start-mysql.sh - - - name: Running Golang tests - run: make test-go - - ruby-test: - runs-on: ubuntu-latest - timeout-minutes: 15 - env: - CI: "true" - MYSQL_VERSION: "5.7" - BUNDLE_WITHOUT: "development" - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-go@v5 - with: - go-version: 1.16 - - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 3.2 - bundler-cache: true - - - name: Starting up MySQL - run: .github/workflows/start-mysql.sh - - - name: Running Ruby tests - run: bundle exec ruby test/main.rb -