Skip to content

Commit

Permalink
fix env var and duplicate line
Browse files Browse the repository at this point in the history
  • Loading branch information
cbusillo committed Jun 13, 2024
1 parent a7381e9 commit c3e3c0c
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/briefcase.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ jobs:
run: |
git fetch --tags
if [ "${{ github.ref }}" = "refs/heads/prerelease" ]; then
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD)
LAST_TAG=$(git ls-remote --tags --refs --sort="v:refname" | tail -n1 | sed 's/.*\///; s/\^{}//' 2>/dev/null || git rev-list --max-parents=0 HEAD)
else
LAST_TAG=$(git describe --tags --abbrev=0 --exclude '*-prerelease' 2>/dev/null || git rev-list --max-parents=0 HEAD)
LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null || git rev-list --max-parents=0 HEAD)
fi
MESSAGES=$(git log --no-merges --pretty=format:"- [%h](https://github.com/${{ github.repository }}/commit/%H) %s" "$LAST_TAG"..HEAD | grep -v "Bump version")
echo "messages<<EOF" >> $GITHUB_OUTPUT
Expand Down
10 changes: 0 additions & 10 deletions push-prerelease-to-release.sh

This file was deleted.

22 changes: 22 additions & 0 deletions push.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/bin/bash

if [ "$1" == "release" ]; then
SOURCE_BRANCH="prerelease"
DESTINATION_BRANCH="release"
elif [ "$1" == "prerelease" ]; then
SOURCE_BRANCH="master"
DESTINATION_BRANCH="prerelease"
else
echo "Please provide the destination branch name as an argument."
exit 1
fi

git checkout "$SOURCE_BRANCH"
git pull origin "$SOURCE_BRANCH"
git checkout "$DESTINATION_BRANCH"
git merge "$SOURCE_BRANCH" -m "merge "$SOURCE_BRANCH" into "$DESTINATION_BRANCH""
git push
git checkout "$SOURCE_BRANCH"
git pull origin "$SOURCE_BRANCH"
git merge "$DESTINATION_BRANCH" -m "merge $DESTINATION_BRANCH into $SOURCE_BRANCH"
git push
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "bd_to_avp"
version = "0.2.65"
version = "0.2.66"
description = "Script to convert 3D Blu-ray Discs (and mts) to Apple Vision Pro (MV-HEVC) files"
authors = ["Chris Busillo <info@shinycomputers.com>"]
readme = "README.md"
Expand Down Expand Up @@ -40,7 +40,7 @@ build-backend = "poetry.core.masonry.api"
project_name = "3D Blu-ray to Vision pro"
bundle = "com.shinycomputers"
architectures = ["arm64"]
version = "0.2.65"
version = "0.2.66"
icon = "bd_to_avp/resources/app_icon"
organization = "Shiny Computers"

Expand Down

0 comments on commit c3e3c0c

Please sign in to comment.