Skip to content

Commit

Permalink
Bring in Upstream Changes from trunk (#176)
Browse files Browse the repository at this point in the history
* Bump Version for Next Release (#174)

* Update pyproject.toml: Bump Version

* Update pyinstaller-linux.yml: ubuntu-24.04

* Update README.md: Reference ubuntu_24.04
  • Loading branch information
ebb-earl-co committed May 30, 2024
1 parent f3bf857 commit 43937ef
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
16 changes: 8 additions & 8 deletions .github/workflows/pyinstaller-linux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Pyinstaller Build on Ubuntu 22.04 for GNU/Linux x86_64
name: Pyinstaller Build on Ubuntu 24.04 for GNU/Linux x86_64
on:
release:
types: ["published"]
Expand Down Expand Up @@ -87,7 +87,7 @@ jobs:
- name: Create Executable with PyInstaller
run: |
pyinstaller \
--name tidal-wave_ubuntu_22.04_amd64 \
--name tidal-wave_ubuntu_24.04_amd64 \
--target-arch=x86_64 \
--paths tidal_wave \
--exclude-module pyinstaller \
Expand All @@ -100,20 +100,20 @@ jobs:
- name: Test just-compiled binary
run: |
chmod +x ./dist/tidal-wave_ubuntu_22.04_amd64
./dist/tidal-wave_ubuntu_22.04_amd64 --help
chmod +x ./dist/tidal-wave_ubuntu_24.04_amd64
./dist/tidal-wave_ubuntu_24.04_amd64 --help
- name: Create SHA256 checksum file of just-compiled binary
run: |
python3 -c "from hashlib import sha256;from pathlib import Path;Path('tidal-wave_ubuntu_22.04_amd64.sha256').write_text(f'''{sha256(Path('./dist/tidal-wave_ubuntu_22.04_amd64').read_bytes()).hexdigest()}\ttidal-wave_ubuntu_22.04_amd64''')"
cat tidal-wave_ubuntu_22.04_amd64.sha256
python3 -c "from hashlib import sha256;from pathlib import Path;Path('tidal-wave_ubuntu_24.04_amd64.sha256').write_text(f'''{sha256(Path('./dist/tidal-wave_ubuntu_24.04_amd64').read_bytes()).hexdigest()}\ttidal-wave_ubuntu_24.04_amd64''')"
cat tidal-wave_ubuntu_24.04_amd64.sha256
- name: Add artifact to release
uses: softprops/action-gh-release@v2
if: startsWith(github.ref, 'refs/tags/')
with:
fail_on_unmatched_files: true
files: |
./dist/tidal-wave_ubuntu_22.04_amd64
tidal-wave_ubuntu_22.04_amd64.sha256
./dist/tidal-wave_ubuntu_24.04_amd64
tidal-wave_ubuntu_24.04_amd64.sha256
token: ${{ github.token }}
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,13 @@ $ (.venv) pip install .
The release artifacts for this project are created with [PyInstaller](https://pyinstaller.org). It bundles Python 3.12.3, FFmpeg 7.0, and the `tidal-wave` program into one binary, licensed under the terms of FFmpeg: with the [GNU Lesser General Public License (LGPL) version 2.1](https://www.gnu.org/licenses/old-licenses/lgpl-2.1.html). Installation is as simple as downloading the correct binary for your platform giving it execute permissions, and running it. **Please make sure that the SHA256 checksum of the file that you have downloaded matches the corresponding `.sha256` file on the releases page!**
#### On Unix-Like
```bash
$ wget https://github.com/ebb-earl-co/tidal-wave/releases/latest/download/tidal-wave_ubuntu_22.04_amd64
$ wget https://github.com/ebb-earl-co/tidal-wave/releases/latest/download/tidal-wave_ubuntu_22.04_amd64.sha256
$ sha256sum --check tidal-wave_ubuntu_22.04_amd64.sha256
# ONLY CONTINUE IF THE OUTPUT IS THE FOLLOWING: 'tidal-wave_ubuntu_22.04_amd64.sha256: OK'
$ wget https://github.com/ebb-earl-co/tidal-wave/releases/latest/download/tidal-wave_ubuntu_24.04_amd64
$ wget https://github.com/ebb-earl-co/tidal-wave/releases/latest/download/tidal-wave_ubuntu_24.04_amd64.sha256
$ sha256sum --check tidal-wave_ubuntu_24.04_amd64.sha256
# ONLY CONTINUE IF THE OUTPUT IS THE FOLLOWING: 'tidal-wave_ubuntu_24.04_amd64.sha256: OK'
# Otherwise, delete the downloaded binary and try to download it again
$ chmod +x ./tidal-wave_ubuntu_22.04_amd64
$ ./tidal-wave_ubuntu_22.04_amd64 --help
$ chmod +x ./tidal-wave_ubuntu_24.04_amd64
$ ./tidal-wave_ubuntu_24.04_amd64 --help
```
#### On Windows
```powershell
Expand Down

0 comments on commit 43937ef

Please sign in to comment.