From 906733a0c181e4ec38c4f11429a48c0166833798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Burak=20Akg=C3=BCn?= Date: Sat, 16 Nov 2024 22:24:22 +0100 Subject: [PATCH 1/2] Update deploy script paths and remove condition in auto-merge workflow --- .github/workflows/dependabot-auto-merge.yml | 1 - .github/workflows/deploy.yml | 4 ++-- README.md | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 43f715e..4b12be5 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -28,7 +28,6 @@ jobs: run: ./gradlew :composeApp:packageDistributionForCurrentOS - name: Automatically Merge Dependabot PRs - if: success() uses: pascalgn/automerge-action@v0.15.6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dae1407..2678245 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,11 +20,11 @@ jobs: distribution: 'temurin' - name: Build - run: ./gradlew :composeApp:wasmJsBrowserProductionWebpack + run: ./gradlew :composeApp:wasmJsBrowserDistribution - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@v4 with: branch: gh-pages - folder: composeApp/build/kotlin-webpack/wasmJs/productionExecutable + folder: composeApp/build/dist/wasmJs/productionExecutable clean: true \ No newline at end of file diff --git a/README.md b/README.md index 32e7242..a5b4f7b 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,7 @@ This game project is built using Kotlin Multiplatform, targeting both Web and De Experience the game in your browser by visiting the demo [here](https://mbakgun.github.io/ButterflyEffect). ⭐️ A great article to read: [The Butterfly Effect](https://thedecisionlab.com/reference-guide/economics/the-butterfly-effect) + https://thedecisionlab.com/reference-guide/economics/the-butterfly-effect ## Conclusion From a48f868ad2d9cfd5fa652f700d7fce17c8056ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Burak=20Akg=C3=BCn?= Date: Sat, 16 Nov 2024 22:28:41 +0100 Subject: [PATCH 2/2] Add success condition to auto-merge dependabot PRs step --- .github/workflows/dependabot-auto-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/dependabot-auto-merge.yml b/.github/workflows/dependabot-auto-merge.yml index 4b12be5..43f715e 100644 --- a/.github/workflows/dependabot-auto-merge.yml +++ b/.github/workflows/dependabot-auto-merge.yml @@ -28,6 +28,7 @@ jobs: run: ./gradlew :composeApp:packageDistributionForCurrentOS - name: Automatically Merge Dependabot PRs + if: success() uses: pascalgn/automerge-action@v0.15.6 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}