From b349d7a440821321192f95cf5b7c2ab5a80fd1f6 Mon Sep 17 00:00:00 2001 From: Ronald Moesbergen Date: Fri, 6 Dec 2024 21:42:51 +0100 Subject: [PATCH] chore: temp. deployment --- .github/workflows/deploy.yaml | 34 ++++------------------------------ package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 9 insertions(+), 35 deletions(-) diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 934a0f1..59ae3a7 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -2,10 +2,8 @@ name: Deploy on: push: - tags: - - v* branches: - - main + - pythonblocks workflow_dispatch: {} jobs: @@ -27,31 +25,15 @@ jobs: node-version: "20.x" registry-url: "https://registry.npmjs.org" - - name: Create TEST env file - if: github.ref_type == 'branch' + - name: Create env file run: | cat << EOF > .env VITE_BACKEND_URL="https://testleaphyeasybloqs.com" VITE_MATOMO_URL="https://leaphyeasybloqs.com/matomo/" VITE_MATOMO_SITE_ID="2" - VITE_SENTRY_DSN="${{ secrets.VITE_SENTRY_DSN }}" - VITE_SENTRY_SAMPLE_RATE="1.0" EOF - echo "ENV=test" >> "$GITHUB_ENV" - echo "STACK=leaphy-webbased-test" >> "$GITHUB_ENV" - - - name: Create PROD env file - if: github.ref_type == 'tag' - run: | - cat << EOF > .env - VITE_BACKEND_URL="https://leaphyeasybloqs.com" - VITE_MATOMO_URL="https://leaphyeasybloqs.com/matomo/" - VITE_MATOMO_SITE_ID="1" - VITE_SENTRY_DSN="${{ secrets.VITE_SENTRY_DSN }}" - VITE_SENTRY_SAMPLE_RATE="0.0" - EOF - echo "ENV=prod" >> "$GITHUB_ENV" - echo "STACK=leaphy-webbased" >> "$GITHUB_ENV" + echo "ENV=python" >> "$GITHUB_ENV" + echo "STACK=leaphy-webbased-python" >> "$GITHUB_ENV" - name: Build application env: @@ -72,11 +54,3 @@ jobs: - name: Redeploy run: | curl https://admin.leaphyeasybloqs.com/hooks/update-docker-image?stack=$STACK -H "X-Token: ${{ secrets.WEBHOOK_TOKEN }}" - - - name: Clean up old images - uses: actions/delete-package-versions@v5 - with: - package-name: "leaphy-webbased-svelte/leaphy-webbased-svelte" - package-type: "container" - min-versions-to-keep: 5 - delete-only-untagged-versions: "true" diff --git a/package.json b/package.json index 3b9c288..8c2577f 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@fortawesome/free-solid-svg-icons": "6.6.0", "@leaphy-robotics/avrdude-webassembly": "1.7.0", "@leaphy-robotics/dfu-util-wasm": "^1.0.2", - "@leaphy-robotics/leaphy-blocks": "3.2.1", + "@leaphy-robotics/leaphy-blocks": "^3.2.1-python", "@leaphy-robotics/picotool-wasm": "1.0.3", "@leaphy-robotics/webusb-ftdi": "1.0.1", "@sentry/svelte": "8.0.0-beta.5", diff --git a/yarn.lock b/yarn.lock index 3905f96..6baf2bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -611,10 +611,10 @@ resolved "https://registry.yarnpkg.com/@leaphy-robotics/dfu-util-wasm/-/dfu-util-wasm-1.0.2.tgz#29afcc01266655e1c7b5da0eeceb0ead48c86fd7" integrity sha512-lvS+tJFO049b4ERYKX0HcoUtnQv76A1z9sZrAvbs7s3bvdMW0BObKmktZeJ7emcp3lU/+OJWsD2h0EY5rnkiNg== -"@leaphy-robotics/leaphy-blocks@3.2.1": - version "3.2.1" - resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-3.2.1.tgz#6d8dd8d2f8429d1f1b1aea47e94e9ef0cb2ab925" - integrity sha512-lA/u7T4/Vkiet32EG1tGMiPq3UZiI7dqSAhT0Hh/YiWUwIx1O+un7+jhjBifqLb9PaLXIRZjuAUsLUPOa4/TbQ== +"@leaphy-robotics/leaphy-blocks@^3.2.1-python": + version "3.2.1-python" + resolved "https://registry.yarnpkg.com/@leaphy-robotics/leaphy-blocks/-/leaphy-blocks-3.2.1-python.tgz#fd732ba63a3b2e1f5624d7f4e13594f74c973334" + integrity sha512-ihoaCgd09CaIlb0YcPvC12vYCxpLeU7BmTwnulsyWa3wghJwdy5qFG/8c1heNpjgB6KCv3xGj6S/G95kqlDo3w== dependencies: blockly "^10.4.3"