From f78f14e2683d20d318fb3fc4ff8adfaf47afbafe Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Wed, 29 Nov 2023 09:58:34 +0100 Subject: [PATCH] fix backend tests --- .github/workflows/backend-test.yml | 2 +- .github/workflows/change-versions.yml | 2 +- .github/workflows/deno_on_release.yml | 4 ++-- .../{docker-310.yml => docker-310.yml.archived} | 2 +- .github/workflows/docker-image.yml | 15 ++++++--------- ...docker-mssql.yml => docker-mssql.yml.archived} | 2 -- .github/workflows/frontend-check.yml | 8 +++++--- .github/workflows/go_on_release.yml | 2 +- .github/workflows/npm_on_release.yml | 2 +- .github/workflows/publish_lsp.yml | 11 +++++++---- .github/workflows/pypi_on_release.yml | 2 +- .github/workflows/release-please.yml | 2 +- 12 files changed, 27 insertions(+), 27 deletions(-) rename .github/workflows/{docker-310.yml => docker-310.yml.archived} (97%) rename .github/workflows/{docker-mssql.yml => docker-mssql.yml.archived} (96%) diff --git a/.github/workflows/backend-test.yml b/.github/workflows/backend-test.yml index fa6b18f5c9..db196ff041 100644 --- a/.github/workflows/backend-test.yml +++ b/.github/workflows/backend-test.yml @@ -15,7 +15,7 @@ on: jobs: cargo_test: - runs-on: [self-hosted, new] + runs-on: ubicloud-standard-8 container: image: ghcr.io/windmill-labs/backend-tests services: diff --git a/.github/workflows/change-versions.yml b/.github/workflows/change-versions.yml index e2db4215ac..fe0ed858f0 100644 --- a/.github/workflows/change-versions.yml +++ b/.github/workflows/change-versions.yml @@ -6,7 +6,7 @@ on: - "version.txt" jobs: change_version: - runs-on: ubuntu-latest + runs-on: ubicloud container: node:18 steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/deno_on_release.yml b/.github/workflows/deno_on_release.yml index 4eecb0934b..68c8b69aa6 100644 --- a/.github/workflows/deno_on_release.yml +++ b/.github/workflows/deno_on_release.yml @@ -8,7 +8,7 @@ env: jobs: build_deno_and_push_to_repo: - runs-on: ubuntu-latest + runs-on: ubicloud steps: - uses: actions/checkout@v3 - name: generate_deno @@ -31,7 +31,7 @@ jobs: tag_repo: needs: [build_deno_and_push_to_repo] - runs-on: ubuntu-latest + runs-on: ubicloud steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/docker-310.yml b/.github/workflows/docker-310.yml.archived similarity index 97% rename from .github/workflows/docker-310.yml rename to .github/workflows/docker-310.yml.archived index b3729ecf6d..de98896927 100644 --- a/.github/workflows/docker-310.yml +++ b/.github/workflows/docker-310.yml.archived @@ -16,7 +16,7 @@ permissions: jobs: build_ee: - runs-on: ubuntu-22.04 + runs-on: ubicloud steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 56d91b75c4..f7824ce8f3 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -20,7 +20,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: ubicloud steps: - uses: actions/checkout@v3 with: @@ -63,7 +63,7 @@ jobs: org.opencontainers.image.licenses=AGPLv3 build_ee: - runs-on: ubuntu-latest + runs-on: ubicloud steps: - uses: actions/checkout@v3 with: @@ -143,7 +143,7 @@ jobs: deploy_s3: needs: [build_ee] - runs-on: ubuntu-latest + runs-on: ubicloud if: github.event_name != 'pull_request' env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -165,10 +165,9 @@ jobs: bucket: windmill-frontend bucket-region: us-east-1 - attach_amd64_binary_to_release: needs: [build, build_ee] - runs-on: ubuntu-latest + runs-on: ubicloud if: ${{ startsWith(github.ref, 'refs/tags/') }} env: ARCH: amd64 @@ -203,7 +202,6 @@ jobs: mv "${{ steps.extract.outputs.destination }}/windmill" "${{ steps.extract.outputs.destination }}/windmill-${ARCH}" mv "${{ steps.extract-ee.outputs.destination }}/windmill" "${{ steps.extract-ee.outputs.destination }}/windmill-ee-${ARCH}" - - name: Attach binary to release uses: softprops/action-gh-release@v1 with: @@ -213,7 +211,7 @@ jobs: attach_arm64_binary_to_release: needs: [build, build_ee] - runs-on: ubuntu-latest + runs-on: ubicoud if: ${{ startsWith(github.ref, 'refs/tags/') }} env: ARCH: arm64 @@ -248,7 +246,6 @@ jobs: mv "${{ steps.extract.outputs.destination }}/windmill" "${{ steps.extract.outputs.destination }}/windmill-${ARCH}" mv "${{ steps.extract-ee.outputs.destination }}/windmill" "${{ steps.extract-ee.outputs.destination }}/windmill-ee-${ARCH}" - - name: Attach binary to release uses: softprops/action-gh-release@v1 with: @@ -258,7 +255,7 @@ jobs: publish_ecr: needs: [build_ee] - runs-on: ubuntu-latest + runs-on: ubicloud if: github.event_name != 'pull_request' steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/docker-mssql.yml b/.github/workflows/docker-mssql.yml.archived similarity index 96% rename from .github/workflows/docker-mssql.yml rename to .github/workflows/docker-mssql.yml.archived index 4f4c3b9deb..4ddff5cc82 100644 --- a/.github/workflows/docker-mssql.yml +++ b/.github/workflows/docker-mssql.yml.archived @@ -5,8 +5,6 @@ env: name: Build windmill:mssql on: workflow_dispatch: - schedule: - - cron: "0 0 */4 * *" concurrency: group: ${{ github.ref }}-mssql diff --git a/.github/workflows/frontend-check.yml b/.github/workflows/frontend-check.yml index bd9d3c6124..ac8ad4272e 100644 --- a/.github/workflows/frontend-check.yml +++ b/.github/workflows/frontend-check.yml @@ -1,14 +1,14 @@ name: check frontend build on: pull_request: - types: [opened,synchronize,reopened,closed] + types: [opened, synchronize, reopened, closed] paths: - "frontend/**" merge_group: jobs: npm_check: - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 @@ -16,4 +16,6 @@ jobs: node-version: 18 - name: "npm check" timeout-minutes: 2 - run: cd frontend && npm ci && npm run generate-backend-client && npm run check + run: + cd frontend && npm ci && npm run generate-backend-client && npm run + check diff --git a/.github/workflows/go_on_release.yml b/.github/workflows/go_on_release.yml index 74042fa595..44b6a030a8 100644 --- a/.github/workflows/go_on_release.yml +++ b/.github/workflows/go_on_release.yml @@ -10,7 +10,7 @@ env: jobs: build_go_and_push_to_repo: - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 steps: - uses: actions/checkout@v3 - uses: actions/setup-go@v4 diff --git a/.github/workflows/npm_on_release.yml b/.github/workflows/npm_on_release.yml index 13017f34d3..a8e28722cc 100644 --- a/.github/workflows/npm_on_release.yml +++ b/.github/workflows/npm_on_release.yml @@ -6,7 +6,7 @@ on: jobs: build_npm: - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 steps: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 diff --git a/.github/workflows/publish_lsp.yml b/.github/workflows/publish_lsp.yml index 9d505f9f3f..032b6e608c 100644 --- a/.github/workflows/publish_lsp.yml +++ b/.github/workflows/publish_lsp.yml @@ -16,14 +16,17 @@ permissions: packages: write jobs: - publish_lsp: - runs-on: ubuntu-latest + sleep: + runs-on: ubicloud steps: - name: Sleep for 900 seconds waiting for pypi to update index if: startsWith(github.ref, 'refs/tags/v') run: sleep 900 shell: bash - + publish_lsp: + needs: [sleep] + runs-on: ubicloud + steps: - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -62,7 +65,7 @@ jobs: publish_lsp_private: needs: [publish_lsp] - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 steps: - uses: actions/checkout@v3 with: diff --git a/.github/workflows/pypi_on_release.yml b/.github/workflows/pypi_on_release.yml index 14278a284c..328033d362 100644 --- a/.github/workflows/pypi_on_release.yml +++ b/.github/workflows/pypi_on_release.yml @@ -7,7 +7,7 @@ on: jobs: publish_pypi: - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 if: startsWith(github.ref, 'refs/tags/v') container: image: ghcr.io/windmill-labs/python-client-builder diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index debb7dea4d..fc6448eec6 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -6,7 +6,7 @@ name: release-please jobs: release-please: name: "Release please" - runs-on: ubuntu-latest + runs-on: ubicloud-standard-8 steps: - uses: GoogleCloudPlatform/release-please-action@v3 with: