diff --git a/.github/workflows/conventional-commits.yml b/.github/workflows/conventional-commits.yml index cb6b9f1..802a603 100644 --- a/.github/workflows/conventional-commits.yml +++ b/.github/workflows/conventional-commits.yml @@ -2,10 +2,11 @@ name: Conventional commits on: push: - branches: ["main"] + branches: ["main", "ci"] pull_request: branches: ["**"] types: [opened, synchronize] + workflow_dispatch: jobs: check: diff --git a/.github/workflows/deploy.yml b/.github/workflows/publish.yml similarity index 77% rename from .github/workflows/deploy.yml rename to .github/workflows/publish.yml index c418385..d6587cc 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/publish.yml @@ -3,7 +3,7 @@ name: Publish on: push: branches: - - main + - ci # main tags: - "*" @@ -27,7 +27,7 @@ jobs: runs-on: ${{ matrix.platform }} strategy: matrix: - platform: [macos-latest, ubuntu-latest, windows-latest] + platform: [macos-latest, windows-latest] # ubuntu-latest steps: - uses: actions/checkout@v4 @@ -58,9 +58,9 @@ jobs: - run: yarn tauri build --ci - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: - name: artifact-${{ matrix.platform }} + name: artifact path: src-tauri/target/release/bundle retention-days: 7 @@ -68,49 +68,50 @@ jobs: needs: [build, upload_license] name: Publish binaries runs-on: ubuntu-latest - if: ${{ github.ref_type == 'tag' }} + # if: ${{ github.ref_type == 'tag' }} steps: - - uses: actions/download-artifact@v3 + - uses: actions/download-artifact@v4 with: path: ~/artifacts - merge-multiple: true + + - run: ls -R - name: Copy artifacts to archive run: | mkdir ups-and-downs.app - cp -r /home/runner/artifacts/bundle/macos/ups-and-downs.app ups-and-downs.app + cp -r /home/runner/artifact/bundle/macos/ups-and-downs.app ups-and-downs.app chmod +x -R ups-and-downs.app - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.app/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.app/ tar -czf ups-and-downs.app.tar.gz ups-and-downs.app/* mkdir ups-and-downs.dmg - cp -r /home/runner/artifacts/bundle/dmg ups-and-downs.dmg + cp -r /home/runner/artifact/bundle/dmg ups-and-downs.dmg chmod +x -R ups-and-downs.dmg - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.dmg/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.dmg/ tar -czf ups-and-downs.dmg.tar.gz ups-and-downs.dmg/* mkdir ups-and-downs.deb - cp -r /home/runner/artifacts/bundle/deb ups-and-downs.deb + cp -r /home/runner/artifact/bundle/deb ups-and-downs.deb chmod +x -R ups-and-downs.deb - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.deb/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.deb/ tar -czf ups-and-downs.deb.tar.gz ups-and-downs.deb/* mkdir ups-and-downs.appimage - cp -r /home/runner/artifacts/bundle/appimage ups-and-downs.appimage + cp -r /home/runner/artifact/bundle/appimage ups-and-downs.appimage chmod +x -R ups-and-downs.appimage - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.appimage/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.appimage/ tar -czf ups-and-downs.appimage.tar.gz ups-and-downs.appimage/* mkdir ups-and-downs.nsis - cp -r /home/runner/artifacts/bundle/nsis ups-and-downs.nsis + cp -r /home/runner/artifact/bundle/nsis ups-and-downs.nsis chmod +x -R ups-and-downs.nsis - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.nsis/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.nsis/ tar -czf ups-and-downs.nsis.tar.gz ups-and-downs.nsis/* mkdir ups-and-downs.msi - cp -r /home/runner/artifacts/bundle/msi ups-and-downs.msi + cp -r /home/runner/artifact/bundle/msi ups-and-downs.msi chmod +x -R ups-and-downs.msi - cp -r /home/runner/artifacts/LICENSE/LICENSE ups-and-downs.msi/ + cp -r /home/runner/artifact/LICENSE/LICENSE ups-and-downs.msi/ tar -czf ups-and-downs.msi.tar.gz ups-and-downs.msi/* - uses: svenstaro/upload-release-action@v1-release diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ac5962f..ae410fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Release on: push: - branches: ["main"] + branches: ["main", "ci"] workflow_dispatch: permissions: diff --git a/cog.toml b/cog.toml index 371f06a..5ed0946 100644 --- a/cog.toml +++ b/cog.toml @@ -1,5 +1,5 @@ ignore_merge_commits = true -branch_whitelist = ["main"] +branch_whitelist = ["main", "ci"] pre_bump_hooks = ["yarn install --immutable", "yarn version {{version}}"] post_bump_hooks = ["git push", "git push origin --tags"]