From 5d84788cded4140881c3d42dd1c3d0efb9045313 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 08:27:01 +0100 Subject: [PATCH 1/6] Create create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 57 ++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 .github/workflows/create-release-for-fv.yaml diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml new file mode 100644 index 0000000..48866f8 --- /dev/null +++ b/.github/workflows/create-release-for-fv.yaml @@ -0,0 +1,57 @@ +name: Build and Push to Folder Overview + +on: + push: + tags: + - "[0-9]+.[0-9]+.[0-9]+" + workflow_dispatch: + inputs: + tag: + description: "Tag to build" + required: true + +jobs: + build-and-push: + runs-on: ubuntu-latest + steps: + - name: Checkout folder-notes + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Use tag from input if triggered manually + run: | + if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then + echo "GITHUB_REF=${{ github.event.inputs.tag }}" >> $GITHUB_ENV + fi + + - name: Run fv-build + run: | + npm install + npm run fv-build + + - name: Checkout folder-overview + uses: actions/checkout@v3 + with: + repository: LostPaul/obsidian-folder-overview + token: ${{ secrets.PAT }} + path: folder-overview + + - name: Copy built files to folder-overview + run: | + cp main.js styles.css folder-overview/ + + - name: Create branch and push to folder-overview + run: | + cd folder-overview + git checkout -b auto-build-${{ github.ref_name }} + git add main.js styles.css + git commit -m "Auto-build from folder-notes ${{ github.ref_name }}" + git push origin auto-build-${{ github.ref_name }} + + - name: Trigger release workflow in folder-overview + run: | + curl -X POST -H "Authorization: token ${{ secrets.PAT }}" \ + -H "Accept: application/vnd.github.v3+json" \ + https://api.github.com/repos/LostPaul/obsidian-folder-overview/actions/workflows/release.yml/dispatches \ + -d '{"ref": "main", "inputs": {"tag": "${{ github.ref_name }}", "branch": "auto-build-${{ github.ref_name }}"}}' From d59340176cfe2aeab74c76e492b0e0733761adf0 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 08:59:32 +0100 Subject: [PATCH 2/6] Update create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml index 48866f8..ec4c099 100644 --- a/.github/workflows/create-release-for-fv.yaml +++ b/.github/workflows/create-release-for-fv.yaml @@ -17,6 +17,7 @@ jobs: - name: Checkout folder-notes uses: actions/checkout@v3 with: + submodules: recursive fetch-depth: 0 - name: Use tag from input if triggered manually From a9da31b6ed4fc768e5c850efa0e7b87b5c02d385 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:09:15 +0100 Subject: [PATCH 3/6] Update create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml index ec4c099..f4a7c87 100644 --- a/.github/workflows/create-release-for-fv.yaml +++ b/.github/workflows/create-release-for-fv.yaml @@ -40,7 +40,8 @@ jobs: - name: Copy built files to folder-overview run: | - cp main.js styles.css folder-overview/ + cp src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ + - name: Create branch and push to folder-overview run: | From 790fc07f42be928c1508a8889664746fc80f9069 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:14:38 +0100 Subject: [PATCH 4/6] Update create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml index f4a7c87..8d1a56b 100644 --- a/.github/workflows/create-release-for-fv.yaml +++ b/.github/workflows/create-release-for-fv.yaml @@ -43,13 +43,14 @@ jobs: cp src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ - - name: Create branch and push to folder-overview + - name: Commit and push built files run: | - cd folder-overview - git checkout -b auto-build-${{ github.ref_name }} - git add main.js styles.css - git commit -m "Auto-build from folder-notes ${{ github.ref_name }}" - git push origin auto-build-${{ github.ref_name }} + git config --local user.email "github-actions[bot]@users.noreply.github.com" + git config --local user.name "github-actions[bot]" + git add -f main.js styles.css + git commit -m "Add built files for release" + git push origin auto-build-main + - name: Trigger release workflow in folder-overview run: | From 4c03e553f730dc64a8dae51f7784fc63bb42d0a7 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:31:26 +0100 Subject: [PATCH 5/6] Update create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml index 8d1a56b..ecdb51c 100644 --- a/.github/workflows/create-release-for-fv.yaml +++ b/.github/workflows/create-release-for-fv.yaml @@ -47,7 +47,7 @@ jobs: run: | git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - git add -f main.js styles.css + git add -f src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ git commit -m "Add built files for release" git push origin auto-build-main From dad0042aa64af18b29d0342d1550197846eecc82 Mon Sep 17 00:00:00 2001 From: Lost Paul <70213368+LostPaul@users.noreply.github.com> Date: Fri, 31 Jan 2025 09:36:33 +0100 Subject: [PATCH 6/6] Update create-release-for-fv.yaml --- .github/workflows/create-release-for-fv.yaml | 26 ++++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.github/workflows/create-release-for-fv.yaml b/.github/workflows/create-release-for-fv.yaml index ecdb51c..f46e822 100644 --- a/.github/workflows/create-release-for-fv.yaml +++ b/.github/workflows/create-release-for-fv.yaml @@ -31,26 +31,36 @@ jobs: npm install npm run fv-build - - name: Checkout folder-overview + - name: Checkout folder-overview repository uses: actions/checkout@v3 with: repository: LostPaul/obsidian-folder-overview token: ${{ secrets.PAT }} path: folder-overview - - name: Copy built files to folder-overview + - name: Initialize and update submodule for folder-overview run: | - cp src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ + cd folder-overview + git submodule update --init --recursive - - - name: Commit and push built files + - name: Copy built files from folder-notes to folder-overview run: | + # Make sure the built files exist and copy them + if [ -f "src/obsidian-folder-overview/main.js" ] && [ -f "src/obsidian-folder-overview/styles.css" ]; then + cp src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ + else + echo "Built files not found, exiting" + exit 1 + fi + + - name: Commit and push built files to folder-overview + run: | + cd folder-overview git config --local user.email "github-actions[bot]@users.noreply.github.com" git config --local user.name "github-actions[bot]" - git add -f src/obsidian-folder-overview/main.js src/obsidian-folder-overview/styles.css folder-overview/ + git add -f main.js styles.css # Add the files inside folder-overview git commit -m "Add built files for release" - git push origin auto-build-main - + git push origin main # Push to main branch or correct branch - name: Trigger release workflow in folder-overview run: |