From 61b9aca746a84c2ec572f3e41a824e56153919bd Mon Sep 17 00:00:00 2001 From: Andrew Bastin Date: Mon, 10 Apr 2023 13:14:47 +0530 Subject: [PATCH] chore: update ci actions --- .../workflows/deploy-firebase-production.yml | 21 ------ .../workflows/deploy-netlify-production.yml | 54 --------------- .github/workflows/deploy-netlify-staging.yml | 67 ------------------- .github/workflows/deploy-netlify-ui.yml | 41 ------------ .github/workflows/publish-docker.yml | 55 --------------- .github/workflows/tests.yml | 2 +- .../hoppscotch-common/src/components.d.ts | 13 ---- pnpm-lock.yaml | 37 +++++----- 8 files changed, 21 insertions(+), 269 deletions(-) delete mode 100644 .github/workflows/deploy-firebase-production.yml delete mode 100644 .github/workflows/deploy-netlify-production.yml delete mode 100644 .github/workflows/deploy-netlify-staging.yml delete mode 100644 .github/workflows/deploy-netlify-ui.yml delete mode 100644 .github/workflows/publish-docker.yml diff --git a/.github/workflows/deploy-firebase-production.yml b/.github/workflows/deploy-firebase-production.yml deleted file mode 100644 index c72ccb2db..000000000 --- a/.github/workflows/deploy-firebase-production.yml +++ /dev/null @@ -1,21 +0,0 @@ -name: Deploy to Firebase (production) - -on: - push: - branches: [main] - -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Deploy to Firebase (production) - uses: FirebaseExtended/action-hosting-deploy@v0 - with: - repoToken: '${{ secrets.GITHUB_TOKEN }}' - firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_POSTWOMAN_API }}' - channelId: live - projectId: postwoman-api diff --git a/.github/workflows/deploy-netlify-production.yml b/.github/workflows/deploy-netlify-production.yml deleted file mode 100644 index 6e4309792..000000000 --- a/.github/workflows/deploy-netlify-production.yml +++ /dev/null @@ -1,54 +0,0 @@ -name: Deploy to Netlify (production) - -on: - push: - branches: [main] - -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup environment - run: mv .env.example .env - - - name: Setup pnpm - uses: pnpm/action-setup@v2.2.4 - with: - version: 7 - run_install: true - - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - cache: pnpm - - - name: Build site - env: - VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - VITE_SENTRY_ENVIRONMENT: production - VITE_SENTRY_RELEASE_TAG: ${{ github.sha }} - run: pnpm run generate - - # Deploy the production site with netlify-cli - - name: Deploy to Netlify (production) - run: npx netlify-cli deploy --dir=packages/hoppscotch-web/dist --prod - env: - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_PRODUCTION_SITE_ID }} - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - - - name: Create Sentry release - uses: getsentry/action-release@v1 - env: - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ORG: ${{ secrets.SENTRY_ORG }} - SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - with: - environment: production - ignore_missing: true - ignore_empty: true - version: ${{ github.sha }} diff --git a/.github/workflows/deploy-netlify-staging.yml b/.github/workflows/deploy-netlify-staging.yml deleted file mode 100644 index a0b70e4a7..000000000 --- a/.github/workflows/deploy-netlify-staging.yml +++ /dev/null @@ -1,67 +0,0 @@ -name: Deploy to Netlify (staging) - -on: - push: - branches: [staging] - pull_request: - branches: [staging] - -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup pnpm - uses: pnpm/action-setup@v2.2.4 - env: - VITE_BACKEND_GQL_URL: ${{ secrets.STAGING_BACKEND_GQL_URL }} - with: - version: 7 - run_install: true - - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - cache: pnpm - - - name: Build site - env: - VITE_GA_ID: ${{ secrets.STAGING_GA_ID }} - VITE_GTM_ID: ${{ secrets.STAGING_GTM_ID }} - VITE_API_KEY: ${{ secrets.STAGING_FB_API_KEY }} - VITE_AUTH_DOMAIN: ${{ secrets.STAGING_FB_AUTH_DOMAIN }} - VITE_DATABASE_URL: ${{ secrets.STAGING_FB_DATABASE_URL }} - VITE_PROJECT_ID: ${{ secrets.STAGING_FB_PROJECT_ID }} - VITE_STORAGE_BUCKET: ${{ secrets.STAGING_FB_STORAGE_BUCKET }} - VITE_MESSAGING_SENDER_ID: ${{ secrets.STAGING_FB_MESSAGING_SENDER_ID }} - VITE_APP_ID: ${{ secrets.STAGING_FB_APP_ID }} - VITE_BASE_URL: ${{ secrets.STAGING_BASE_URL }} - VITE_BACKEND_GQL_URL: ${{ secrets.STAGING_BACKEND_GQL_URL }} - VITE_BACKEND_WS_URL: ${{ secrets.STAGING_BACKEND_WS_URL }} - VITE_SENTRY_DSN: ${{ secrets.SENTRY_DSN }} - VITE_SENTRY_RELEASE_TAG: ${{ github.sha }} - VITE_SENTRY_ENVIRONMENT: staging - run: pnpm run generate - - # Deploy the staging site with netlify-cli - - name: Deploy to Netlify (staging) - run: npx netlify-cli deploy --dir=packages/hoppscotch-web/dist --prod - env: - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_STAGING_SITE_ID }} - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} - - - name: Create Sentry release - uses: getsentry/action-release@v1 - env: - SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }} - SENTRY_ORG: ${{ secrets.SENTRY_ORG }} - SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }} - with: - environment: staging - ignore_missing: true - ignore_empty: true - version: ${{ github.sha }} diff --git a/.github/workflows/deploy-netlify-ui.yml b/.github/workflows/deploy-netlify-ui.yml deleted file mode 100644 index 67ed1315b..000000000 --- a/.github/workflows/deploy-netlify-ui.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Deploy to Netlify (ui) - -on: - push: - branches: [main] - # run this workflow only if an update is made to the ui package - paths: - - "packages/hoppscotch-ui/**" - -jobs: - deploy: - name: Deploy - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Setup environment - run: mv .env.example .env - - - name: Setup pnpm - uses: pnpm/action-setup@v2.2.4 - with: - version: 7 - run_install: true - - - name: Setup node - uses: actions/setup-node@v3 - with: - node-version: ${{ matrix.node }} - cache: pnpm - - - name: Build site - run: pnpm run generate-ui - - # Deploy the ui site with netlify-cli - - name: Deploy to Netlify (ui) - run: npx netlify-cli deploy --dir=packages/hoppscotch-ui/.histoire/dist --prod - env: - NETLIFY_SITE_ID: ${{ secrets.NETLIFY_UI_SITE_ID }} - NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }} diff --git a/.github/workflows/publish-docker.yml b/.github/workflows/publish-docker.yml deleted file mode 100644 index 01566d59e..000000000 --- a/.github/workflows/publish-docker.yml +++ /dev/null @@ -1,55 +0,0 @@ -name: Publish Docker image - -on: - push: - branches: [main] - release: - types: [published] - -jobs: - publish: - name: Publish - runs-on: ubuntu-latest - steps: - - name: Maximize build space - uses: easimon/maximize-build-space@master - with: - root-reserve-mb: 8192 - swap-size-mb: 18432 - remove-dotnet: 'true' - remove-android: 'true' - remove-haskell: 'true' - - - name: Checkout - uses: actions/checkout@v3 - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - - name: Log in to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v4 - with: - images: hoppscotch/hoppscotch - flavor: | - latest=true - prefix= - suffix= - - - name: Build and push Docker image - uses: docker/build-push-action@v3 - with: - context: . - push: true - platforms: linux/amd64,linux/arm64 - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 2faac5bbd..2cf042711 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -25,7 +25,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v2.2.4 with: - version: 7 + version: 8 run_install: true - name: Setup node diff --git a/packages/hoppscotch-common/src/components.d.ts b/packages/hoppscotch-common/src/components.d.ts index bd7a18364..8e77b3d59 100644 --- a/packages/hoppscotch-common/src/components.d.ts +++ b/packages/hoppscotch-common/src/components.d.ts @@ -98,19 +98,6 @@ declare module '@vue/runtime-core' { HttpTestResultReport: typeof import('./components/http/TestResultReport.vue')['default'] HttpTests: typeof import('./components/http/Tests.vue')['default'] HttpURLEncodedParams: typeof import('./components/http/URLEncodedParams.vue')['default'] - IconLucideAlertTriangle: typeof import('~icons/lucide/alert-triangle')['default'] - IconLucideArrowLeft: typeof import('~icons/lucide/arrow-left')['default'] - IconLucideCheckCircle: typeof import('~icons/lucide/check-circle')['default'] - IconLucideChevronRight: typeof import('~icons/lucide/chevron-right')['default'] - IconLucideGlobe: typeof import('~icons/lucide/globe')['default'] - IconLucideHelpCircle: typeof import('~icons/lucide/help-circle')['default'] - IconLucideInbox: typeof import('~icons/lucide/inbox')['default'] - IconLucideInfo: typeof import('~icons/lucide/info')['default'] - IconLucideLayers: typeof import('~icons/lucide/layers')['default'] - IconLucideMinus: typeof import('~icons/lucide/minus')['default'] - IconLucideSearch: typeof import('~icons/lucide/search')['default'] - IconLucideUser: typeof import('~icons/lucide/user')['default'] - IconLucideUsers: typeof import('~icons/lucide/users')['default'] LensesHeadersRenderer: typeof import('./components/lenses/HeadersRenderer.vue')['default'] LensesHeadersRendererEntry: typeof import('./components/lenses/HeadersRendererEntry.vue')['default'] LensesRenderersHTMLLensRenderer: typeof import('./components/lenses/renderers/HTMLLensRenderer.vue')['default'] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 30686293e..c1dce1bf6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -281,10 +281,10 @@ importers: packages/hoppscotch-cli: devDependencies: '@hoppscotch/data': - specifier: workspace:^0.4.4 + specifier: workspace:^ version: link:../hoppscotch-data '@hoppscotch/js-sandbox': - specifier: workspace:^2.0.0 + specifier: workspace:^ version: link:../hoppscotch-js-sandbox '@relmify/jest-fp-ts': specifier: ^2.0.2 @@ -389,16 +389,16 @@ importers: specifier: ^6.0.2 version: 6.0.2 '@hoppscotch/codemirror-lang-graphql': - specifier: workspace:^0.2.0 + specifier: workspace:^ version: link:../codemirror-lang-graphql '@hoppscotch/data': - specifier: workspace:^0.4.4 + specifier: workspace:^ version: link:../hoppscotch-data '@hoppscotch/js-sandbox': - specifier: workspace:^2.1.0 + specifier: workspace:^ version: link:../hoppscotch-js-sandbox '@hoppscotch/ui': - specifier: workspace:^0.0.1 + specifier: workspace:^ version: link:../hoppscotch-ui '@hoppscotch/vue-toasted': specifier: ^0.1.0 @@ -763,7 +763,7 @@ importers: packages/hoppscotch-js-sandbox: dependencies: '@hoppscotch/data': - specifier: workspace:^0.4.4 + specifier: workspace:^ version: link:../hoppscotch-data fp-ts: specifier: ^2.11.10 @@ -923,6 +923,9 @@ importers: eslint-plugin-vue: specifier: ^9.5.1 version: 9.5.1(eslint@8.29.0) + npm-run-all: + specifier: ^4.1.5 + version: 4.1.5 typescript: specifier: ^4.6.4 version: 4.9.3 @@ -978,7 +981,7 @@ importers: specifier: ^3.1.1 version: 3.1.1(graphql@16.6.0) '@hoppscotch/ui': - specifier: workspace:^0.0.1 + specifier: workspace:^ version: link:../hoppscotch-ui '@hoppscotch/vue-toasted': specifier: ^0.1.0 @@ -1313,7 +1316,7 @@ importers: specifier: workspace:^ version: link:../hoppscotch-common '@hoppscotch/data': - specifier: workspace:^0.4.4 + specifier: workspace:^ version: link:../hoppscotch-data '@hoppscotch/ui': specifier: workspace:^ @@ -9213,7 +9216,7 @@ packages: hasBin: true /after@0.8.2: - resolution: {integrity: sha512-QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==} + resolution: {integrity: sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=} dev: false /agent-base@6.0.2: @@ -9825,7 +9828,7 @@ packages: resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==} /base64-arraybuffer@0.1.4: - resolution: {integrity: sha512-a1eIFi4R9ySrbiMuyTGx5e92uRH5tQY6kArNcFaKBUleIoLjdjBg7Zxm3Mqm3Kmkf27HLR/1fnxX9q8GQ7Iavg==} + resolution: {integrity: sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=} engines: {node: '>= 0.6.0'} dev: false @@ -10472,14 +10475,14 @@ packages: dev: true /component-bind@1.0.0: - resolution: {integrity: sha512-WZveuKPeKAG9qY+FkYDeADzdHyTYdIboXS59ixDeRJL5ZhxpqUnxSOwop4FQjMsiYm3/Or8cegVbpAHNA7pHxw==} + resolution: {integrity: sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=} dev: false /component-emitter@1.3.0: resolution: {integrity: sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==} /component-inherit@0.0.3: - resolution: {integrity: sha512-w+LhYREhatpVqTESyGFg3NlP6Iu0kEKUHETY9GoZP/pQyW4mHFZuFWRUCIqVPZ36ueVLtoOEZaAqbCF2RDndaA==} + resolution: {integrity: sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=} dev: false /concat-map@0.0.1: @@ -13726,7 +13729,7 @@ packages: dev: false /has-cors@1.1.0: - resolution: {integrity: sha512-g5VNKdkFuUuVCP9gYfDJHjK2nqdQJ7aDLTnycnc2+RvsOQbuLdF5pm7vuE5J76SEBIQjs4kQY/BWq74JUmjbXA==} + resolution: {integrity: sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=} dev: false /has-flag@3.0.0: @@ -14119,7 +14122,7 @@ packages: engines: {node: '>=8'} /indexof@0.0.1: - resolution: {integrity: sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==} + resolution: {integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=} dev: false /inflight@1.0.6: @@ -19820,7 +19823,7 @@ packages: dev: true /to-array@0.1.4: - resolution: {integrity: sha512-LhVdShQD/4Mk4zXNroIQZJC+Ap3zgLcDuwEdcmLv9CCO73NWockQDwyUnW/m8VX/EElfL6FcYx7EeutN4HJA6A==} + resolution: {integrity: sha1-F+bBH3PdTz10zaek/zI46a2b+JA=} dev: false /to-fast-properties@2.0.0: @@ -22411,7 +22414,7 @@ packages: dev: false /yeast@0.1.2: - resolution: {integrity: sha512-8HFIh676uyGYP6wP13R/j6OJ/1HwJ46snpvzE7aHAN3Ryqh2yX6Xox2B4CUmTwwOIzlG3Bs7ocsP5dZH/R1Qbg==} + resolution: {integrity: sha1-AI4G2AlDIMNy28L47XagymyKxBk=} dev: false /yn@3.1.1: