CI: Update some stuff

This commit is contained in:
tt2468 2021-08-30 02:30:48 -07:00
parent ac78acd28c
commit d669db24ac

View File

@ -164,12 +164,7 @@ jobs:
- name: 'Set PR Artifact Filename' - name: 'Set PR Artifact Filename'
shell: bash shell: bash
run: | run: |
if [ "${{ env.GIT_TAG }}" ] ; then \ echo "WIN_FILENAME=obs-websocket-${{ env.PACKAGE_VERSION }}-Windows" >> $GITHUB_ENV
FILENAME="obs-websocket-${{ env.GIT_TAG }}-Windows" ; \
else \
FILENAME="obs-websocket-${{ env.GIT_HASH }}-git-Windows" ; \
fi
echo "WIN_FILENAME=$FILENAME" >> $GITHUB_ENV
- name: 'Package obs-websocket' - name: 'Package obs-websocket'
working-directory: ${{ github.workspace }}/obs-websocket working-directory: ${{ github.workspace }}/obs-websocket
run: | run: |
@ -229,7 +224,7 @@ jobs:
if [ "$GIT_TAG" ] ; then \ if [ "$GIT_TAG" ] ; then \
VERSION="$GIT_TAG" ; \ VERSION="$GIT_TAG" ; \
else \ else \
VERSION="$GIT_HASH-git" ; \ VERSION="1-$GIT_HASH-git" ; \
fi fi
echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV echo "PACKAGE_VERSION=$VERSION" >> $GITHUB_ENV
- name: 'Install prerequisites (Apt)' - name: 'Install prerequisites (Apt)'
@ -327,13 +322,8 @@ jobs:
- name: 'Set PR Artifact Filename' - name: 'Set PR Artifact Filename'
shell: bash shell: bash
run: | run: |
if [ "${{ env.GIT_TAG }}" ] ; then \ echo "LINUX_FILENAME=obs-websocket-${{ env.PACKAGE_VERSION }}-Ubuntu64.deb" >> $GITHUB_ENV
FILENAME="obs-websocket-${{ env.GIT_TAG }}-Ubuntu64.deb" ; \ - name: 'Package ${{ env.LINUX_FILENAME }}'
else \
FILENAME="obs-websocket-${{ env.GIT_HASH }}-git-Ubuntu64.deb" ; \
fi
echo "FILENAME=$FILENAME" >> $GITHUB_ENV
- name: 'Package ${{ env.FILENAME }}'
if: success() if: success()
working-directory: ${{ github.workspace }}/obs-websocket working-directory: ${{ github.workspace }}/obs-websocket
shell: bash shell: bash
@ -346,9 +336,9 @@ jobs:
--requires="obs-studio,libqt5network5,libqt5concurrent5,qt5-image-formats-plugins" \ --requires="obs-studio,libqt5network5,libqt5concurrent5,qt5-image-formats-plugins" \
--pakdir="../package" --pakdir="../package"
sudo chmod ao+r ../package/* sudo chmod ao+r ../package/*
sudo mv ../package/* ../package/${{ env.FILENAME }} sudo mv ../package/* ../package/${{ env.LINUX_FILENAME }}
cd - cd -
- name: 'Publish ${{ env.FILENAME }}' - name: 'Publish ${{ env.LINUX_FILENAME }}'
if: success() if: success()
uses: actions/upload-artifact@v2-preview uses: actions/upload-artifact@v2-preview
with: with: