diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index bf79ac5aa77..722e0628aaf 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -57,7 +57,10 @@ jobs: cd build/linux/x64/release/bundle || exit tar -czaf $archiveName ./* + shasum -a 256 $archiveName > sha256.txt + mv $archiveName "$baseDir"/ + mv sha256.txt "$baseDir"/ - name: Upload app archive to workflow uses: actions/upload-artifact@v3 @@ -65,6 +68,12 @@ jobs: name: Invoice-Ninja-Archive path: Invoice-Ninja-Linux-Portable.tar.gz + - name: Upload app archive hash to workflow + uses: actions/upload-artifact@v3 + with: + name: Invoice-Ninja-Hash + path: sha256.txt + - name: Download artifacts uses: actions/download-artifact@v3 with: @@ -80,6 +89,7 @@ jobs: automatic_release_tag: "v5.0.128" files: | ${{ github.workspace }}/artifacts/Invoice-Ninja-Archive + ${{ github.workspace }}/artifacts/Invoice-Ninja-Hash # build-flatpak: # name: Build flatpak diff --git a/.github/workflows/hashes.yml b/.github/workflows/hashes.yml deleted file mode 100644 index bcb6f76c53f..00000000000 --- a/.github/workflows/hashes.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Generate Hashes - -on: - release: - types: [published] - -jobs: - build: - name: Generate Hashes - env: - commit_secret: ${{ secrets.commit_secret }} - runs-on: ubuntu-latest - steps: - - - name: Generate Hashes - uses: MCJack123/ghaction-generate-release-hashes@v4 - with: - hash-type: sha256 - file-name: hashes.txt - - - uses: actions/upload-artifact@v2 - with: - name: Asset Hashes - path: hashes.txt - -# - name: Upload Hashes to release -# uses: svenstaro/upload-release-action@v2 -# with: -# repo_token: ${{ secrets.GITHUB_TOKEN }} -# file: hashes.txt -# overwrite: true -# asset_name: hashes.txt -# tag: ${{ github.ref }} diff --git a/bump_version.sh b/bump_version.sh index 795e7742508..0ec93bfad7a 100644 --- a/bump_version.sh +++ b/bump_version.sh @@ -5,21 +5,9 @@ new_vesion=$((current_version+1)) echo "Bump version... $current_version => $new_vesion" -#sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.yaml -#sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.foss.yaml -#sed -i -e "s/v5.0.$current_version/v5.0.$new_vesion/g" ./.github/workflows/flatpak.yml - +sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.yaml +sed -i -e "s/version: 5.0.$current_version+$current_version/version: 5.0.$new_vesion+$new_vesion/g" ./pubspec.foss.yaml +sed -i -e "s/v5.0.$current_version/v5.0.$new_vesion/g" ./.github/workflows/flatpak.yml sed -i -e 's//\n /g' ./flatpak/com.invoiceninja.app.metainfo.xml - - -#sed -i -e "s///g" ./pubspec.foss.yaml -#sed -i -e "s///g" ./pubspec.foss.yaml -#sed -i -e "s///g" ./pubspec.foss.yaml - - -# X pubspec.yaml -# X pubspec.foss.yaml -# X flatpak.yml -# com.invoiceninja.app.metainfo -# contants -# snapcraft +sed -i -e "s/kClientVersion = '5.0.$current_version'/kClientVersion = '5.0.$new_vesion'/g" ./lib/constants.dart +sed -i -e "s/version: '5.0.$current_version'/version: '5.0.$new_vesion'/g" ./snap/snapcraft.yaml \ No newline at end of file