From dd279f4f546a79cce2f29eac7c4bee2271442d97 Mon Sep 17 00:00:00 2001 From: buck Date: Thu, 15 Feb 2024 10:28:40 -0600 Subject: [PATCH] fix: environment vars for deploy --- .github/workflows/deploy.yml | 24 ++++++++++++------------ apps/coordinator/package.json | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c52feb34..bd93cbac 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,11 +1,12 @@ name: Deploy -on: - push: - tags: - - '@caravan/coordinator**' - branches: - - main +# on: +# push: +# tags: +# - '@caravan/coordinator**' +# branches: +# - main +on: [push, pull_request] permissions: contents: write @@ -14,10 +15,8 @@ jobs: deploy: name: Deploy runs-on: ubuntu-latest - # To use Turborepo Remote Caching env: - TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }} - TURBO_TEAM: ${{ vars.TURBO_TEAM }} + GITHUB_PAGES: true steps: - name: Checkout Repo @@ -36,11 +35,12 @@ jobs: # so we have to copy it to the root of the repo. - name: Build run: | - npx turbo run build - cp -R apps/coordinator ./build + echo ${{ env.GITHUB_PAGES }} + GH_PAGES=true npx turbo run build --force + cp -R apps/coordinator . - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages - folder: build + folder: . diff --git a/apps/coordinator/package.json b/apps/coordinator/package.json index edb6c59a..f7c3e3ff 100644 --- a/apps/coordinator/package.json +++ b/apps/coordinator/package.json @@ -1,6 +1,6 @@ { "name": "@caravan/coordinator", - "version": "0.0.3", + "version": "0.0.2", "description": "Unchained Capital's Bitcoin Multisig Coordinator Application", "main": "index.jsx", "private": true, @@ -69,7 +69,7 @@ "build:ci": "npm run ci && tsc && __GIT_SHA__=`git rev-parse --short HEAD` vite build", "check": "npm run lint && npm run test:ci", "ci": "npm run lint && npm run test:ci", - "deploy": "gh-pages -d build", + "deploy": "GH_PAGES=true gh-pages -d build", "gh-pages": "CI=true npm run build && gh-pages -d build", "lint": "eslint --ext .js,.jsx,.ts,.tsx src/", "predeploy": "npm run build",