diff --git a/.github/workflows/build-test-deploy.yaml b/.github/workflows/build-test-deploy.yaml index 0849d49a8..a50e175e8 100644 --- a/.github/workflows/build-test-deploy.yaml +++ b/.github/workflows/build-test-deploy.yaml @@ -22,17 +22,14 @@ concurrency: jobs: fail_if_pull_request_is_draft: if: github.event.pull_request.draft == true - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Fails in order to indicate that pull request needs to be marked as ready to review and unit tests workflow needs to pass. run: exit 1 - - test: + + ensure-schemas-are-generated: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - uses: actions/setup-go@v5 with: go-version: "1.22" @@ -41,13 +38,22 @@ jobs: echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV echo "$(go env GOPATH)/bin" >> $GITHUB_PATH shell: bash - - name: Run linters - run: make install-golangci-lint lint - - name: Run tests - run: make test + - name: test + run: | + ls + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + - name: check file + run: | + git rev-parse --abbrev-ref HEAD + cat pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go + pwd + ls ./../../../ + - run: make check-schemas - test-integration: - runs-on: ubuntu-latest + test: + runs-on: ubuntu-20.04 steps: - uses: actions/setup-go@v5 with: @@ -60,31 +66,33 @@ jobs: shell: bash - uses: actions/checkout@v4 - - uses: replicatedhq/action-k3s@main - id: k3s - with: - version: v1.24.1-k3s1 - - run: make test-integration + - run: make test - ensure-schemas-are-generated: - runs-on: ubuntu-latest + test-integration: + runs-on: ubuntu-20.04 steps: - uses: actions/setup-go@v5 with: go-version: "1.22" + - name: setup env run: | echo "GOPATH=$(go env GOPATH)" >> $GITHUB_ENV echo "$(go env GOPATH)/bin" >> $GITHUB_PATH shell: bash + - uses: actions/checkout@v4 + - uses: replicatedhq/action-k3s@main + id: k3s with: - fetch-depth: 0 - - run: make check-schemas + version: v1.24.1-k3s1 + + - run: make test-integration compile-preflight: runs-on: ubuntu-latest + needs: ensure-schemas-are-generated steps: - uses: actions/setup-go@v5 with: @@ -174,6 +182,7 @@ jobs: compile-supportbundle: runs-on: ubuntu-latest + needs: ensure-schemas-are-generated steps: - uses: actions/setup-go@v5 with: @@ -249,6 +258,7 @@ jobs: compile-collect: runs-on: ubuntu-latest + needs: ensure-schemas-are-generated steps: - uses: actions/setup-go@v5 with: @@ -388,4 +398,4 @@ jobs: # if the validate-pr-tests job was successful, this job will succeed - name: succeed if validate-pr-tests job succeeded if: needs.validate-pr-tests.result == 'success' - run: echo "Validation succeeded" \ No newline at end of file + run: echo "Validation succeeded" diff --git a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go index 49399e767..412b6031b 100644 --- a/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go +++ b/pkg/client/troubleshootclientset/typed/troubleshoot/v1beta2/supportbundle.go @@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ -// Code generated by client-gen. DO NOT EDIT. +// Code generated by client-gen. DO NOT EDIT. ------------------------------ package v1beta2