From cb0cfbe64059c4022e910573e315f206fc3d7b2a Mon Sep 17 00:00:00 2001 From: Gizzy Date: Fri, 20 Dec 2024 11:37:36 +0000 Subject: [PATCH 1/4] test --- .github/workflows/build-and-release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 5fc8322..0bb6080 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -205,6 +205,7 @@ jobs: sed -i "s/^pkgver=.*$/pkgver=${{ needs.release.outputs.version_tag }}/" ./build/PKGBUILD - name: Publish AUR package + if: false uses: KSXGitHub/github-actions-deploy-aur@3.0.1 with: pkgname: bskydesktop From 01e9154a333ff1e3a60e496afb4f96b48595d20d Mon Sep 17 00:00:00 2001 From: Gizzy Date: Fri, 20 Dec 2024 12:37:30 +0000 Subject: [PATCH 2/4] test --- .github/workflows/build-and-release.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 0bb6080..b75566a 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -204,14 +204,14 @@ jobs: sed -i "s|sha256sums=('SKIP' 'SKIP')|sha256sums=('$new_checksum' 'SKIP')|" ./build/PKGBUILD sed -i "s/^pkgver=.*$/pkgver=${{ needs.release.outputs.version_tag }}/" ./build/PKGBUILD - - name: Publish AUR package - if: false - uses: KSXGitHub/github-actions-deploy-aur@3.0.1 - with: - pkgname: bskydesktop - pkgbuild: ./build/PKGBUILD - commit_username: ${{ secrets.AUR_USERNAME }} - commit_email: ${{ secrets.AUR_EMAIL }} - ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} - commit_message: New Version - ssh_keyscan_types: rsa,ecdsa,ed25519 +# - name: Publish AUR package +# if: false +# uses: KSXGitHub/github-actions-deploy-aur@3.0.1 +# with: +# pkgname: bskydesktop +# pkgbuild: ./build/PKGBUILD +# commit_username: ${{ secrets.AUR_USERNAME }} +# commit_email: ${{ secrets.AUR_EMAIL }} +# ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }} +# commit_message: New Version +# ssh_keyscan_types: rsa,ecdsa,ed25519 From 5539ae2c63075aa305cf035b03cc076a49bb6191 Mon Sep 17 00:00:00 2001 From: Gizzy Date: Fri, 20 Dec 2024 12:43:44 +0000 Subject: [PATCH 3/4] test --- .github/workflows/build-and-release.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index b75566a..67dec95 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -197,9 +197,12 @@ jobs: name: checksums path: ./sha256sum.txt + - name: Get app version + id: version + uses: pchynoweth/action-get-npm-version@1.1.1 - name: Extract checksum from sha256sum.txt and change build version run: | - echo releasever + echo ${{ steps.version.outputs.version }} new_checksum=$(awk 'NR==1 { print $1 }' ./sha256sum.txt) sed -i "s|sha256sums=('SKIP' 'SKIP')|sha256sums=('$new_checksum' 'SKIP')|" ./build/PKGBUILD sed -i "s/^pkgver=.*$/pkgver=${{ needs.release.outputs.version_tag }}/" ./build/PKGBUILD From 9947bfc3dc0fd5e21f2c00c43477322fb1c2f8ab Mon Sep 17 00:00:00 2001 From: Gizzy Date: Fri, 20 Dec 2024 12:52:53 +0000 Subject: [PATCH 4/4] test --- .github/workflows/build-and-release.yml | 139 ++++++++++++------------ 1 file changed, 70 insertions(+), 69 deletions(-) diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml index 67dec95..866d820 100644 --- a/.github/workflows/build-and-release.yml +++ b/.github/workflows/build-and-release.yml @@ -56,78 +56,78 @@ jobs: name: checksums path: sha256sum.txt - build-windows: - name: Build bsky-desktop (Windows) - runs-on: windows-latest - env: - ext: "exe" - GITHUB_TOKEN: ${{ secrets.GHT }} + # build-windows: + # name: Build bsky-desktop (Windows) + # runs-on: windows-latest + # env: + # ext: "exe" + # GITHUB_TOKEN: ${{ secrets.GHT }} - steps: - - name: Checkout git repo - uses: actions/checkout@v3 + # steps: + # - name: Checkout git repo + # uses: actions/checkout@v3 - - name: Setup node and npm - uses: actions/setup-node@v3 - with: - node-version: 16 + # - name: Setup node and npm + # uses: actions/setup-node@v3 + # with: + # node-version: 16 - - name: Install dependencies - run: npm install + # - name: Install dependencies + # run: npm install - - name: Build (x64) - run: npm run build -- --arch x64 + # - name: Build (x64) + # run: npm run build -- --arch x64 - - name: Build (arm64) - run: npm run build -- --arch arm64 + # - name: Build (arm64) + # run: npm run build -- --arch arm64 - - name: Upload Windows Artifacts - uses: actions/upload-artifact@v4 - id: upload-artifact - with: - name: windows-artifacts - path: | - dist/*.exe - dist/latest*.yml + # - name: Upload Windows Artifacts + # uses: actions/upload-artifact@v4 + # id: upload-artifact + # with: + # name: windows-artifacts + # path: | + # dist/*.exe + # dist/latest*.yml - build-macos: - name: Build bsky-desktop (macOS) - runs-on: macos-latest - env: - ext: "dmg" - GITHUB_TOKEN: ${{ secrets.GHT }} + # build-macos: + # name: Build bsky-desktop (macOS) + # runs-on: macos-latest + # env: + # ext: "dmg" + # GITHUB_TOKEN: ${{ secrets.GHT }} - steps: - - name: Checkout git repo - uses: actions/checkout@v3 + # steps: + # - name: Checkout git repo + # uses: actions/checkout@v3 - - name: Setup node and npm - uses: actions/setup-node@v3 - with: - node-version: 16 + # - name: Setup node and npm + # uses: actions/setup-node@v3 + # with: + # node-version: 16 - - name: Install dependencies - run: npm install + # - name: Install dependencies + # run: npm install - - name: Build (x64) - run: npm run build -- --arch x64 + # - name: Build (x64) + # run: npm run build -- --arch x64 - - name: Build (arm64) - run: npm run build -- --arch arm64 + # - name: Build (arm64) + # run: npm run build -- --arch arm64 - - name: Upload macOS Artifacts - uses: actions/upload-artifact@v4 - id: upload-artifact - with: - name: macos-artifacts - path: | - dist/*.dmg - dist/latest*.yml + # - name: Upload macOS Artifacts + # uses: actions/upload-artifact@v4 + # id: upload-artifact + # with: + # name: macos-artifacts + # path: | + # dist/*.dmg + # dist/latest*.yml release: name: Create Release runs-on: ubuntu-latest - needs: [build-linux, build-windows, build-macos] + needs: [build-linux] outputs: version_tag: ${{ steps.version.outputs.version }} env: @@ -147,17 +147,17 @@ jobs: name: linux-artifacts path: dist/linux - - name: Download Windows Artifacts - uses: actions/download-artifact@v4 - with: - name: windows-artifacts - path: dist/windows + #- name: Download Windows Artifacts + # uses: actions/download-artifact@v4 + # with: + # name: windows-artifacts + # path: dist/windows - - name: Download macOS Artifacts - uses: actions/download-artifact@v4 - with: - name: macos-artifacts - path: dist/macos + #- name: Download macOS Artifacts + # uses: actions/download-artifact@v4 + # with: + # name: macos-artifacts + # path: dist/macos - name: Display structure of downloaded files run: ls -R dist @@ -176,9 +176,9 @@ jobs: generate_release_notes: true files: | dist/linux/*.AppImage - dist/windows/*.exe - dist/macos/*.dmg - dist/combined.yml + # dist/windows/*.exe + # dist/macos/*.dmg + # dist/combined.yml aur: name: Publish to AUR @@ -205,7 +205,8 @@ jobs: echo ${{ steps.version.outputs.version }} new_checksum=$(awk 'NR==1 { print $1 }' ./sha256sum.txt) sed -i "s|sha256sums=('SKIP' 'SKIP')|sha256sums=('$new_checksum' 'SKIP')|" ./build/PKGBUILD - sed -i "s/^pkgver=.*$/pkgver=${{ needs.release.outputs.version_tag }}/" ./build/PKGBUILD + sed -i "s/^pkgver=.*$/pkgver=${{ steps.version.outputs.version }}/" ./build/PKGBUILD + cat ./build/PKGBUILD # - name: Publish AUR package # if: false