diff --git a/.github/uffizzi/docker-compose.uffizzi.yml b/.github/uffizzi/docker-compose.uffizzi.yml index 596ce3f6fc..9014348433 100644 --- a/.github/uffizzi/docker-compose.uffizzi.yml +++ b/.github/uffizzi/docker-compose.uffizzi.yml @@ -31,11 +31,11 @@ services: volumes: - worker_dependency_cache:/tmp/windmill/cache - # lsp: - # image: '${LSP_IMAGE}' - # restart: unless-stopped - # ports: - # - 3001:3001 + lsp: + image: '${LSP_IMAGE}' + restart: unless-stopped + ports: + - 3001:3001 # caddy: # image: caddy:2.5.2-alpine diff --git a/.github/workflows/pypi_on_release.yml b/.github/workflows/pypi_on_release.yml index ec31fab802..bd8b392496 100644 --- a/.github/workflows/pypi_on_release.yml +++ b/.github/workflows/pypi_on_release.yml @@ -74,6 +74,7 @@ jobs: ${{ env.ECR_REGISTRY }}/${{ env.IMAGE_NAME }}:latest ${{ steps.metalocal.outputs.tags }} ${{ steps.meta.outputs.tags }} + registry.uffizzi.com/windmill-lsp:60d labels: ${{ steps.metalocal.outputs.labels }} cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:buildcache,mode=max diff --git a/.github/workflows/uffizzi-build.yml b/.github/workflows/uffizzi-build.yml index 71f0fc5b28..1eab0f2a99 100644 --- a/.github/workflows/uffizzi-build.yml +++ b/.github/workflows/uffizzi-build.yml @@ -3,10 +3,6 @@ on: pull_request: types: [opened,synchronize,reopened,closed] -concurrency: - group: ${{ github.ref }} - cancel-in-progress: true - jobs: build-windmill: name: Build and Push `windmill` @@ -38,6 +34,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max + render-compose-file: name: Render Docker Compose File # Pass output of this workflow to another triggered by `workflow_run` event. @@ -53,7 +50,7 @@ jobs: run: | WINDMILL_IMAGE=${{ needs.build-windmill.outputs.tags }} export WINDMILL_IMAGE - LSP_IMAGE=ghcr.io/windmill-labs/windmill-lsp:latest + LSP_IMAGE=registry.uffizzi.com/windmill-lsp:60d export LSP_IMAGE envsubst '${WINDMILL_IMAGE} ${LSP_IMAGE}' < ./.github/uffizzi/docker-compose.uffizzi.yml > docker-compose.rendered.yml cat docker-compose.rendered.yml @@ -64,7 +61,7 @@ jobs: path: docker-compose.rendered.yml retention-days: 2 - name: Serialize PR Event to File - run: | + run: | cat << EOF > event.json ${{ toJSON(github.event) }} EOF @@ -82,10 +79,7 @@ jobs: steps: # If this PR is closing, we will not render a compose file nor pass it to the next workflow. - name: Serialize PR Event to File - run: | - cat << EOF > event.json - ${{ toJSON(github.event) }} - EOF + run: echo '${{ toJSON(github.event) }}' > event.json - name: Upload PR Event as Artifact uses: actions/upload-artifact@v3 with: