Merge pull request #1313 from bnnm/master

builds fixes
This commit is contained in:
bnnm 2023-02-18 17:10:33 +01:00 committed by GitHub
commit 56b4b4de18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions

View File

@ -19,7 +19,7 @@ jobs:
fetch-depth: 0 fetch-depth: 0
- name: Install dependencies - name: Install dependencies
run: brew install autoconf automake cmake ffmpeg jansson libao libvorbis mpg123 run: brew install autoconf automake cmake pkgconfig ffmpeg jansson libao libvorbis mpg123
- name: Cache celt - name: Cache celt
uses: actions/cache@v3 uses: actions/cache@v3
@ -62,8 +62,6 @@ jobs:
shell: bash shell: bash
env: env:
UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }} UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }}
# tar cvfz vgmstream-linux-123.tar.gz -C ./build/cli vgmstream123
# tar cvfz vgmstream-linux-audacious.tar.gz -C ./build/audacious vgmstream.so
run: | run: |
tar cvfz vgmstream-mac-cli.tar.gz -C ./build/cli vgmstream-cli tar cvfz vgmstream-mac-cli.tar.gz -C ./build/cli vgmstream-cli
python3 .github/uploader.py vgmstream-mac-cli.tar.gz python3 .github/uploader.py vgmstream-mac-cli.tar.gz

View File

@ -66,11 +66,12 @@ jobs:
- name: Upload artifacts to vgmstream-releases - name: Upload artifacts to vgmstream-releases
if: github.event_name != 'pull_request' if: github.event_name != 'pull_request'
shell: cmd shell: cmd
working-directory: ${{github.workspace}}
env: env:
UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }} UPLOADER_GITHUB_TOKEN: ${{ secrets.UPLOADER_GITHUB_TOKEN }}
run: | run: |
python ${{github.workspace}}\.github\uploader.py ${{runner.workspace}}\bin\vgmstream-win.zip ${{runner.workspace}}\bin\vgmstream-win64.zip ${{runner.workspace}}\bin\foo_input_vgmstream.fb2k-component python .github\uploader.py bin\vgmstream-win.zip bin\vgmstream-win64.zip bin\foo_input_vgmstream.fb2k-component
python ${{github.workspace}}\.github\uploader.py --changelog python .github\uploader.py --changelog
#- name: Upload artifacts to S3 #- name: Upload artifacts to S3
# if: github.event_name != 'pull_request' # if: github.event_name != 'pull_request'

View File

@ -279,7 +279,7 @@ function MakePackage
# github actions/artifact uploads config, that need a dir with files to make an .zip artifact (don't allow single/pre-zipped files) # github actions/artifact uploads config, that need a dir with files to make an .zip artifact (don't allow single/pre-zipped files)
function MakePackageArtifacts function MakePackageArtifacts
{ {
#MakePackage MakePackage
mkdir -Force bin/artifacts/cli-x32 mkdir -Force bin/artifacts/cli-x32
mkdir -Force bin/artifacts/cli-x64 mkdir -Force bin/artifacts/cli-x64