diff --git a/Cargo.lock b/Cargo.lock index ac88573..5d62a8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -694,9 +694,9 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.4" +version = "0.27.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6884a48c6826ec44f524c7456b163cebe9e55a18d7b5e307cb4f100371cc767" +checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2" dependencies = [ "futures-util", "http", @@ -1928,7 +1928,7 @@ dependencies = [ [[package]] name = "tod" -version = "0.6.18" +version = "0.6.19" dependencies = [ "chrono", "chrono-tz", diff --git a/Cargo.toml b/Cargo.toml index 64b8a2f..1ce0b86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tod" -version = "0.6.18" +version = "0.6.19" authors = ["Alan Vardy "] edition = "2021" license = "MIT" diff --git a/PUBLISH_CHECKLIST.md b/PUBLISH_CHECKLIST.md index 05dd35b..72da1c0 100644 --- a/PUBLISH_CHECKLIST.md +++ b/PUBLISH_CHECKLIST.md @@ -14,20 +14,19 @@ Create `tod-bin` directory for pushing to AUR 2. Create PR with ```fish -VERSION=v0.6.18 ./create_pr.sh +VERSION=0.6.19 ./create_pr.sh ``` 3. Wait for it to pass, then merge and pull in latest changes ```fish -gh pr merge -r --admin -gs +gh pr merge -r --admin && gs ``` 4. Release it to all the places ```fish -VERSION=v0.6.18 ./release.sh +VERSION=0.6.19 ./release.sh ``` ## Publish to Cargo and AUR (older method) diff --git a/create_pr.sh b/create_pr.sh index 0895b40..28c2d6b 100755 --- a/create_pr.sh +++ b/create_pr.sh @@ -2,7 +2,7 @@ # Check if the VERSION environment variable is set if [ -z "${VERSION}" ]; then echo "Error: VERSION environment variable is not set." - echo "Usage: VERSION=v0.6.15 ./publish.sh" + echo "Usage: VERSION=0.6.15 ./publish.sh" exit 1 fi @@ -12,10 +12,10 @@ ambr --regex "^version = \"\d+\.\d+\.\d+\"" "version = \"$VERSION\"" Cargo.toml echo "=== UPDATE AND TEST ===" && ./update_test.sh && echo "=== CREATING PR ===" && -gt create "$VERSION" -a -m "$VERSION" --no-interactive && +gt create "v$VERSION" -a -m "v$VERSION" --no-interactive && gt submit --no-interactive && gh pr ready && sleep 5 && gh pr checks --watch -i 5; -soundcomplete; +paplay /usr/share/sounds/freedesktop/stereo/complete.oga; diff --git a/push_aur.sh b/push_aur.sh index 93bf7e0..ef081fe 100755 --- a/push_aur.sh +++ b/push_aur.sh @@ -16,7 +16,7 @@ rm target/cargo-aur/*.tar.gz && cd ../tod-bin/ || exit && echo "=== PUSHING TO AUR ===" && git add . && -git commit -m "new version" && +git commit -m "v$VERSION" && git push aur && cd ../tod || exit && echo "=== SUCCESS ===" diff --git a/release.sh b/release.sh index b074104..468af4c 100755 --- a/release.sh +++ b/release.sh @@ -4,7 +4,7 @@ echo "=== RUNNING cargo aur ===" && cargo aur && echo "=== CREATING GITHUB RELEASE ===" && -gh release create "$VERSION" ./target/cargo-aur/*.tar.gz --title "$VERSION" --generate-notes && +gh release create "v$VERSION" ./target/cargo-aur/*.tar.gz --title "v$VERSION" --generate-notes && echo "=== RUNNING cargo publish ===" && cargo publish && echo "=== RUNNING push_aur.sh ===" &&