From 1a9eaf15fc9739660948a23df0fe5ef7c9ebe300 Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Wed, 27 May 2020 13:29:07 -0700 Subject: [PATCH 1/3] Add test matrix --- .github/workflows/build-and-test.yaml | 5 ++++- config/crds/v1/databases.schemahero.io_databases.yaml | 2 +- config/crds/v1beta1/databases.schemahero.io_databases.yaml | 2 +- pkg/installer/database_objects.go | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index bff97caf3..7ebfe7134 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -34,6 +34,9 @@ jobs: test-postgres: runs-on: ubuntu-latest needs: build + strategy: + matrix: + postgres_version: [10.13, 11.8, 12.3] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -42,7 +45,7 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/postgres run + - run: make -C integration/tests/postgres ${{matrix.postgres_version}} test-mysql: runs-on: ubuntu-latest diff --git a/config/crds/v1/databases.schemahero.io_databases.yaml b/config/crds/v1/databases.schemahero.io_databases.yaml index 30eaac7cd..86557314e 100644 --- a/config/crds/v1/databases.schemahero.io_databases.yaml +++ b/config/crds/v1/databases.schemahero.io_databases.yaml @@ -133,7 +133,7 @@ spec: type: object type: object type: object - disableShellCommand: + enableShellCommand: type: boolean immediateDeploy: type: boolean diff --git a/config/crds/v1beta1/databases.schemahero.io_databases.yaml b/config/crds/v1beta1/databases.schemahero.io_databases.yaml index aa69511d7..0c2cf52b0 100644 --- a/config/crds/v1beta1/databases.schemahero.io_databases.yaml +++ b/config/crds/v1beta1/databases.schemahero.io_databases.yaml @@ -133,7 +133,7 @@ spec: type: object type: object type: object - disableShellCommand: + enableShellCommand: type: boolean immediateDeploy: type: boolean diff --git a/pkg/installer/database_objects.go b/pkg/installer/database_objects.go index cf492607f..949689f52 100644 --- a/pkg/installer/database_objects.go +++ b/pkg/installer/database_objects.go @@ -135,7 +135,7 @@ spec: type: object type: object type: object - disableShellCommand: + enableShellCommand: type: boolean immediateDeploy: type: boolean @@ -310,7 +310,7 @@ spec: type: object type: object type: object - disableShellCommand: + enableShellCommand: type: boolean immediateDeploy: type: boolean From 5a258cd4e05712c53931d455bd98d0db68bee24b Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Wed, 27 May 2020 13:34:58 -0700 Subject: [PATCH 2/3] All matrix --- .github/workflows/build-and-test.yaml | 10 ++++++++-- .github/workflows/tagged-release.yaml | 17 +++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 7ebfe7134..23d487148 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -50,6 +50,9 @@ jobs: test-mysql: runs-on: ubuntu-latest needs: build + strategy: + matrix: + mysql_version: [5.6, 5.7, 8.0] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -58,11 +61,14 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/mysql run + - run: make -C integration/tests/mysql ${{matrix.mysql_version}} test-cockroach: runs-on: ubuntu-latest needs: build + strategy: + matrix: + cockroachdb_version: [v19.2.7, v20.1.0] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -71,7 +77,7 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/cockroach run + - run: make -C integration/tests/cockroach ${{matrix.cockroachdb_version}} kots: runs-on: ubuntu-latest diff --git a/.github/workflows/tagged-release.yaml b/.github/workflows/tagged-release.yaml index 2162b9e80..53365abbf 100644 --- a/.github/workflows/tagged-release.yaml +++ b/.github/workflows/tagged-release.yaml @@ -33,6 +33,9 @@ jobs: test-postgres: runs-on: ubuntu-latest needs: build + strategy: + matrix: + postgres_version: [10.13, 11.8, 12.3] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -41,11 +44,14 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/postgres run + - run: make -C integration/tests/postgres ${{matrix.postgres_version}} test-mysql: runs-on: ubuntu-latest needs: build + strategy: + matrix: + mysql_version: [5.6, 5.7, 8.0] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -54,11 +60,14 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/mysql run + - run: make -C integration/tests/mysql ${{matrix.mysql_version}} test-cockroach: runs-on: ubuntu-latest needs: build + strategy: + matrix: + cockroachdb_version: [v19.2.7, v20.1.0] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -67,8 +76,8 @@ jobs: name: schemahero path: bin/ - run: chmod +x bin/schemahero - - run: make -C integration/tests/cockroach run - + - run: make -C integration/tests/cockroach ${{matrix.cockroachdb_version}} + goreleaser: runs-on: ubuntu-latest needs: From 7ad55c4ff18b997057f837dd29b0b3413b13f301 Mon Sep 17 00:00:00 2001 From: Marc Campbell Date: Wed, 27 May 2020 13:39:29 -0700 Subject: [PATCH 3/3] strings --- .github/workflows/build-and-test.yaml | 6 +++--- .github/workflows/tagged-release.yaml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 23d487148..1f3486477 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -36,7 +36,7 @@ jobs: needs: build strategy: matrix: - postgres_version: [10.13, 11.8, 12.3] + postgres_version: ["10.13", "11.8", "12.3"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -52,7 +52,7 @@ jobs: needs: build strategy: matrix: - mysql_version: [5.6, 5.7, 8.0] + mysql_version: ["5.6", "5.7", "8.0"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -68,7 +68,7 @@ jobs: needs: build strategy: matrix: - cockroachdb_version: [v19.2.7, v20.1.0] + cockroachdb_version: ["v19.2.7", "v20.1.0"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary diff --git a/.github/workflows/tagged-release.yaml b/.github/workflows/tagged-release.yaml index 53365abbf..690467823 100644 --- a/.github/workflows/tagged-release.yaml +++ b/.github/workflows/tagged-release.yaml @@ -35,7 +35,7 @@ jobs: needs: build strategy: matrix: - postgres_version: [10.13, 11.8, 12.3] + postgres_version: ["10.13", "11.8", "12.3"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -51,7 +51,7 @@ jobs: needs: build strategy: matrix: - mysql_version: [5.6, 5.7, 8.0] + mysql_version: ["5.6", "5.7", "8.0"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -67,7 +67,7 @@ jobs: needs: build strategy: matrix: - cockroachdb_version: [v19.2.7, v20.1.0] + cockroachdb_version: ["v19.2.7", "v20.1.0"] steps: - uses: actions/checkout@v2 - name: Download schemahero binary @@ -77,7 +77,7 @@ jobs: path: bin/ - run: chmod +x bin/schemahero - run: make -C integration/tests/cockroach ${{matrix.cockroachdb_version}} - + goreleaser: runs-on: ubuntu-latest needs: