From cba478bd96f9607874280d00d228ec34acd673c0 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Wed, 12 Mar 2025 23:35:14 +0530 Subject: [PATCH 1/4] chore: revert matrix runner to single runner build --- .github/workflows/release-push-docker.yml | 58 +++++++++++++++-------- 1 file changed, 39 insertions(+), 19 deletions(-) diff --git a/.github/workflows/release-push-docker.yml b/.github/workflows/release-push-docker.yml index 51e0bc95..64bea6bb 100644 --- a/.github/workflows/release-push-docker.yml +++ b/.github/workflows/release-push-docker.yml @@ -7,14 +7,14 @@ on: jobs: build: - strategy: - matrix: - platform: [ - { platform: linux/amd64, cache: docker-release-amd64 }, - { platform: linux/arm64, cache: docker-release-arm64 }, - ] + # strategy: + # matrix: + # platform: [ + # { platform: linux/amd64, cache: docker-release-amd64 }, + # { platform: linux/arm64, cache: docker-release-arm64 }, + # ] runs-on: ubuntu-latest - continue-on-error: true # We can continue each platform deployment if the other fails + # continue-on-error: true # We can continue each platform deployment if the other fails steps: - name: Checkout uses: actions/checkout@v4 @@ -41,10 +41,15 @@ jobs: file: ./prod.Dockerfile target: backend push: true - cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} - cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + cache-from: type=gha,timeout=200m,scope=docker-release-allarch + cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch + # platforms: | + # ${{ matrix.platform.platform }} platforms: | - ${{ matrix.platform.platform }} + linux/amd64 + linux/arm64 tags: | ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:latest ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_BACKEND_CONTAINER_NAME }}:${{ github.ref_name }} @@ -56,10 +61,15 @@ jobs: file: ./prod.Dockerfile target: app push: true - cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} - cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + cache-from: type=gha,timeout=200m,scope=docker-release-allarch + cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch + # platforms: | + # ${{ matrix.platform.platform }} platforms: | - ${{ matrix.platform.platform }} + linux/amd64 + linux/arm64 tags: | ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:latest ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_FRONTEND_CONTAINER_NAME }}:${{ github.ref_name }} @@ -71,10 +81,15 @@ jobs: file: ./prod.Dockerfile target: sh_admin push: true - cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} - cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + cache-from: type=gha,timeout=200m,scope=docker-release-allarch + cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch + # platforms: | + # ${{ matrix.platform.platform }} platforms: | - ${{ matrix.platform.platform }} + linux/amd64 + linux/arm64 tags: | ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:latest ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_SH_ADMIN_CONTAINER_NAME }}:${{ github.ref_name }} @@ -86,10 +101,15 @@ jobs: file: ./prod.Dockerfile target: aio push: true - cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} - cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-from: type=gha,timeout=200m,scope=${{ matrix.platform.cache }} + # cache-to: type=gha,mode=max,timeout=200m,scope=${{ matrix.platform.cache }} + cache-from: type=gha,timeout=200m,scope=docker-release-allarch + cache-to: type=gha,mode=max,timeout=200m,scope=docker-release-allarch + # platforms: | + # ${{ matrix.platform.platform }} platforms: | - ${{ matrix.platform.platform }} + linux/amd64 + linux/arm64 tags: | ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:latest ${{ secrets.DOCKER_ORG_NAME }}/${{ secrets.DOCKER_AIO_CONTAINER_NAME }}:${{ github.ref_name }} From 795f7cf19b7b859b7043687739b3b0dc45ba4ac0 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Wed, 12 Mar 2025 23:39:12 +0530 Subject: [PATCH 2/4] chore: add workflow_dispatch to the docker release ci --- .github/workflows/release-push-docker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/release-push-docker.yml b/.github/workflows/release-push-docker.yml index 64bea6bb..800b71a5 100644 --- a/.github/workflows/release-push-docker.yml +++ b/.github/workflows/release-push-docker.yml @@ -4,6 +4,9 @@ on: push: tags: - '*.*.*' + workflow_dispatch: + inputs: + # NO INPUTS jobs: build: From 5b0125b4127be55415766e2ddfa8a47d07742d44 Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Thu, 13 Mar 2025 01:44:52 +0530 Subject: [PATCH 3/4] chore: temporary skip for docker release ci --- .github/workflows/release-push-docker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-push-docker.yml b/.github/workflows/release-push-docker.yml index 800b71a5..2d3acf4d 100644 --- a/.github/workflows/release-push-docker.yml +++ b/.github/workflows/release-push-docker.yml @@ -39,6 +39,7 @@ jobs: - name: Build and push the backend container uses: docker/build-push-action@v4 + if: false # TODO: Temporary, remove later with: context: . file: ./prod.Dockerfile @@ -59,6 +60,7 @@ jobs: - name: Build and push the frontend container uses: docker/build-push-action@v4 + if: false # TODO: Temporary, remove later with: context: . file: ./prod.Dockerfile From 212cd4969d76de131426482a0e387ca53065c961 Mon Sep 17 00:00:00 2001 From: Shreyas Date: Thu, 13 Mar 2025 16:25:25 +0530 Subject: [PATCH 4/4] docs(desktop): include windows specific caveats (#4884) --- packages/hoppscotch-desktop/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/hoppscotch-desktop/README.md b/packages/hoppscotch-desktop/README.md index e015d45b..6dc6d8a9 100644 --- a/packages/hoppscotch-desktop/README.md +++ b/packages/hoppscotch-desktop/README.md @@ -42,9 +42,9 @@ Access Hoppscotch Cloud Edition from Hoppscotch Desktop App: > [!Note] > To enable desktop app support for your self-hosted Hoppscotch instance, make sure to update the `WHITELISTED_ORIGINS` environment variable in your `.env` file with your deployment URL. > -> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` to the `WHITELISTED_ORIGINS` environment variable. +> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` (MacOS, Linux) and `http://app.hoppscotch_mydomain_com` (Windows) to the `WHITELISTED_ORIGINS` environment variable. > ```bash -> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com +> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com,http://app.hoppscotch_mydomain_com > ``` Add your self-hosted Hoppscotch Community Edition instance to Hoppscotch Desktop App: @@ -92,9 +92,9 @@ Add your self-hosted Hoppscotch Community Edition instance to Hoppscotch Desktop > [!Note] > To enable desktop app support for your self-hosted Hoppscotch instance, make sure to update the `WHITELISTED_ORIGINS` environment variable in your `.env` file with your deployment URL. > -> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` to the `WHITELISTED_ORIGINS` environment variable. +> e.g. to allow connection to `https://hoppscotch.mydomain.com` you need to add `app://hoppscotch_mydomain_com` (MacOS, Linux) and `http://app.hoppscotch_mydomain_com` (Windows) to the `WHITELISTED_ORIGINS` environment variable. > ```bash -> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com +> WHITELISTED_ORIGINS=...existing_origins,app://hoppscotch_mydomain_com,http://app.hoppscotch_mydomain_com > ``` Add your self-hosted Hoppscotch Enterprise Edition instance to Hoppscotch Desktop App: