diff --git a/.github/workflows/deploy-any-branch-pages.yml b/.github/workflows/deploy-any-branch-pages.yml deleted file mode 100644 index 0ff45c9b8..000000000 --- a/.github/workflows/deploy-any-branch-pages.yml +++ /dev/null @@ -1,64 +0,0 @@ -name: Deploy any branch to Cloud - -on: - workflow_dispatch: - inputs: - git-ref: - description: "Release Git Ref (Which branch or tag to build?)" - required: true - default: "feat/db" - cloudflare-project-name: - description: "Cloudflare pages project name" - required: true - default: "logseq-any-branch" - -env: - CLOJURE_VERSION: "1.10.1.763" - NODE_VERSION: "18" - JAVA_VERSION: "11" - -jobs: - build-and-deploy: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - name: Setup Java JDK - uses: actions/setup-java@v3 - with: - distribution: "zulu" - java-version: ${{ env.JAVA_VERSION }} - - - name: Set up Node - uses: actions/setup-node@v3 - with: - node-version: ${{ env.NODE_VERSION }} - - - name: Setup clojure - uses: DeLaGuardo/setup-clojure@11.0 - with: - cli: ${{ env.CLOJURE_VERSION }} - - - name: Fetch yarn deps - run: yarn install --frozen-lockfile - - - name: Set Build Environment Variables - run: | - echo "ENABLE_FILE_SYNC_PRODUCTION=false" >> $GITHUB_ENV - - - name: Build Released-Web - run: | - yarn gulp:build && clojure -M:cljs release app --config-merge '{:compiler-options {:source-map-include-sources-content false :source-map-detail-level :symbols}}' - rsync -avz --exclude node_modules --exclude android --exclude ios ./static/ ./public/static/ - ls -lR ./public - - - name: Publish to Cloudflare Pages - uses: cloudflare/pages-action@1 - with: - apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} - accountId: 2553ea8236c11ea0f88de28fce1cbfee - projectName: "logseq-db-demo" - directory: "public" - gitHubToken: ${{ secrets.GITHUB_TOKEN }} - branch: "main" diff --git a/.github/workflows/deploy-stage-to-master.yml b/.github/workflows/deploy-stage-to-master.yml index 518211f79..924239b6f 100644 --- a/.github/workflows/deploy-stage-to-master.yml +++ b/.github/workflows/deploy-stage-to-master.yml @@ -2,7 +2,17 @@ name: Deploy master to cloudflare pages for test on: push: - branches: ["master"] + branches: [ "master" ] + workflow_dispatch: + inputs: + git-ref: + description: "Release Git Ref (Which branch or tag to build?)" + required: true + default: "master" + cloudflare-project-name: + description: "Cloudflare pages project name" + required: true + default: "logseq-dev" env: CLOJURE_VERSION: "1.10.1.763" @@ -47,6 +57,6 @@ jobs: apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }} accountId: 2553ea8236c11ea0f88de28fce1cbfee projectName: "logseq-dev" - directory: "static" + directory: "public" gitHubToken: ${{ secrets.GITHUB_TOKEN }} branch: "production"