diff --git a/.github/actions/build_linux/Dockerfile b/.github/actions/build_linux/Dockerfile index 229d369..ed022d9 100644 --- a/.github/actions/build_linux/Dockerfile +++ b/.github/actions/build_linux/Dockerfile @@ -10,7 +10,7 @@ LABEL "homepage"="TBD" LABEL "maintainer"="dewb" RUN apt-get update -RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq +RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq zstd ADD entrypoint.sh /entrypoint.sh RUN chmod a+x /entrypoint.sh diff --git a/.github/actions/build_win/Dockerfile b/.github/actions/build_win/Dockerfile index cbd0572..94946e2 100644 --- a/.github/actions/build_win/Dockerfile +++ b/.github/actions/build_win/Dockerfile @@ -10,7 +10,7 @@ LABEL "homepage"="TBD" LABEL "maintainer"="dewb" RUN apt-get update -RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq g++-mingw-w64-x86-64 +RUN apt-get install -y build-essential cmake curl gcc g++ git make tar unzip zip libgl1-mesa-dev libglu1-mesa-dev jq zstd g++-mingw-w64-x86-64 ADD entrypoint.sh /entrypoint.sh RUN chmod a+x /entrypoint.sh diff --git a/.github/actions/update_asset/entrypoint.sh b/.github/actions/update_asset/entrypoint.sh index 7e73bfd..ae7f00e 100755 --- a/.github/actions/update_asset/entrypoint.sh +++ b/.github/actions/update_asset/entrypoint.sh @@ -9,11 +9,6 @@ GITHUB_UPLOAD_URL=https://uploads.github.com REPO=${GITHUB_REPOSITORY#"https://github.com/"} # work around url parsing bug in act for local testing -# If the action was triggered on a branch other than master, terminate with neutral status -if [ ${GITHUB_REF} != "refs/heads/master" ] ; then - exit 78 -fi - FILENAME=$(basename ${ASSET_PATH}) # Get information about the release diff --git a/.github/actions/update_tag/entrypoint.sh b/.github/actions/update_tag/entrypoint.sh index 08292ec..a27a4bf 100755 --- a/.github/actions/update_tag/entrypoint.sh +++ b/.github/actions/update_tag/entrypoint.sh @@ -2,16 +2,11 @@ # expects TAG and REF environment variables set in workflow -set -eu +set -eux GITHUB_API_URL=https://api.github.com REPO=${GITHUB_REPOSITORY#"https://github.com/"} # work around url parsing bug in act for local testing -# If the action was triggered on a different ref than specified, terminate with neutral status -if [ ${GITHUB_REF} != ${REF} ] ; then - exit 78 -fi - # Update the tag to point to the ref curl -i \ --header "Authorization: token ${GITHUB_TOKEN}" \ diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 56c508c..1eda587 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -5,18 +5,20 @@ jobs: name: Build Linux runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@main - name: Build Linux uses: ./.github/actions/build_linux env: RACK_SDK_VERSION: 2.0.3 - name: Tag Head as Latest + if: ${{ github.ref == 'refs/heads/main' }} uses: ./.github/actions/update_tag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REF: refs/heads/master + REF: refs/heads/main TAG: latest - name: Upload Linux Release + if: ${{ github.ref == 'refs/heads/main' }} uses: ./.github/actions/update_asset env: ASSET_PATH: dist/vitamin-2.0.1-lin.zip @@ -26,18 +28,20 @@ jobs: name: Build Windows runs-on: ubuntu-latest steps: - - uses: actions/checkout@master + - uses: actions/checkout@main - name: Build Windows uses: ./.github/actions/build_win env: RACK_SDK_VERSION: 2.0.3 - name: Tag Head as Latest + if: ${{ github.ref == 'refs/heads/main' }} uses: ./.github/actions/update_tag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - REF: refs/heads/master + REF: refs/heads/main TAG: latest - name: Upload Windows Release + if: ${{ github.ref == 'refs/heads/main' }} uses: ./.github/actions/update_asset env: ASSET_PATH: dist/vitamin-2.0.1-win.zip @@ -48,7 +52,7 @@ jobs: # name: Build OSX # runs-on: ubuntu-latest # steps: -# - uses: actions/checkout@master +# - uses: actions/checkout@main # - name: Build OSX # uses: ./.github/actions/build_osx # env: @@ -57,7 +61,7 @@ jobs: # uses: ./.github/actions/update_tag # env: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} -# REF: refs/heads/master +# REF: refs/heads/main # TAG: latest # - name: Upload OSX Release # uses: ./.github/actions/update_asset diff --git a/README.md b/README.md index 9b7efeb..ed719a3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ Features two mono lines, two stereo lines, and a single mono-to-stereo line. The mono-to-stereo line performs a constant power center pan to the outputs when bypassing, to maintain constant apparent volume. -![Vitamin B Screenshot](https://raw.githubusercontent.com/xaviershay/vcv-modules/master/images/vitamin-b.png) +![Vitamin B Screenshot](https://raw.githubusercontent.com/xaviershay/vcv-modules/main/images/vitamin-b.png) ## Vitamin P (Pan) @@ -25,7 +25,7 @@ full range of control either: * set the knob to left position with a unipolar input 0V to 10V. * set the knob to middle position with a bipolar input -5V to 5V. -![Vitamin P Screenshot](https://raw.githubusercontent.com/xaviershay/vcv-modules/master/images/vitamin-p.png) +![Vitamin P Screenshot](https://raw.githubusercontent.com/xaviershay/vcv-modules/main/images/vitamin-p.png) # Development