diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml deleted file mode 100644 index 371e4779..00000000 --- a/.github/release-drafter.yml +++ /dev/null @@ -1,32 +0,0 @@ -name-template: 'v$RESOLVED_VERSION 🌈' -tag-template: 'v$RESOLVED_VERSION' -categories: - - title: '🚀 Features' - labels: - - 'feature' - - 'enhancement' - - 'new' - - title: '🐛 Bug Fixes' - labels: - - 'fix' - - 'bugfix' - - 'bug' - - title: '🧰 Maintenance' - label: 'chore' -change-template: '- $TITLE @$AUTHOR (#$NUMBER)' -change-title-escapes: '\<*_&' # You can add # and @ to disable mentions, and add ` to disable code blocks. -version-resolver: - major: - labels: - - 'major' - minor: - labels: - - 'minor' - patch: - labels: - - 'patch' - default: patch -template: | - ## Changes - - $CHANGES \ No newline at end of file diff --git a/.github/workflows/dev-latest.yml b/.github/workflows/dev-latest.yml index 93a6883d..3dbdf0c3 100644 --- a/.github/workflows/dev-latest.yml +++ b/.github/workflows/dev-latest.yml @@ -54,7 +54,7 @@ jobs: - name: Upload artifact uses: actions/upload-artifact@v3 with: - name: dist.zip + name: dist path: webui/dist.zip @@ -75,11 +75,6 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - name: Download artifact - uses: actions/download-artifact@v2 - with: - name: dist.zip - - name: Docker metadata id: meta uses: docker/metadata-action@v4 @@ -104,6 +99,12 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.ACCESS_TOKEN }} + - name: Download artifact + uses: actions/download-artifact@v2 + with: + name: dist + path: backend/dist.zip + - name: Build and push uses: docker/build-push-action@v3 with: @@ -114,10 +115,17 @@ jobs: generate_release: runs-on: ubuntu-latest - needs: [test] + needs: [dev-build] steps: - name: Checkout code uses: actions/checkout@v3 + + - name: Download artifact + uses: actions/download-artifact@v2 + with: + name: dist + path: webui/dist.zip + - name: Generate Release uses: softprops/action-gh-release@v1 with: @@ -125,6 +133,7 @@ jobs: name: 🌙${{ github.ref_name }} draft: true prerelease: true + files: webui/dist.zip env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 79f38562..ce7e001f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -73,7 +73,7 @@ jobs: uses: actions/download-artifact@v3 with: name: dist - path: dist.zip + path: webui/dist.zip - name: Generate Release uses: softprops/action-gh-release@v1 @@ -84,7 +84,7 @@ jobs: draft: true prerelease: false files: | - dist.zip + webui/dist.zip env: GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index afc1b051..19ea1750 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -21,7 +21,7 @@ jobs: with: token: ${{ secrets.ACCESS_TOKEN }} commit-message: 'chore: release ${{ github.ref }}' - title: 'chore: release ${{ github.ref }}' + title: '${{ github.ref }}' body: | ${{ steps.pr.outputs.body }} branch: release/${{ github.ref }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 7b6661ea..00000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Generate Release Draft - -on: - pull_request: - types: - - closed - branches: - - main - -jobs: - generate_release_draft: - runs-on: ubuntu-latest - if: > - github.event.pull_request.merged == true && - github.event.pull_request.base.ref == 'main' - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Generate Release - uses: softprops/action-gh-release@v1 - with: - tag_name: ${{ github.event.pull_request.title }} - name: 🌟${{ github.event.pull_request.title }} - body: ${{ github.event.pull_request.body }} - draft: false - prerelease: false - env: - GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/docs/wiki b/docs/wiki index 519e381e..d0bb98f0 160000 --- a/docs/wiki +++ b/docs/wiki @@ -1 +1 @@ -Subproject commit 519e381e8a1add62e76a39181ee61bad02816035 +Subproject commit d0bb98f004fb292519dd56c42238ecb2f034eac9