Last change should upload correctly

This commit is contained in:
Michael J. Manley
2023-11-02 13:27:07 -07:00
parent 6ba1b02653
commit 33a4bc6c46
4 changed files with 33 additions and 9 deletions

View File

@@ -119,12 +119,15 @@ jobs:
if: runner.os == 'Windows' if: runner.os == 'Windows'
shell: msys2 {0} shell: msys2 {0}
run: | run: |
export INSTALL_PREFIX=$(pwd)/dist export INSTALL_PREFIX=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $INSTALL_PREFIX cd $INSTALL_PREFIX
ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin" ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
zip -r -9 ${{ matrix.artifacts_path }} * zip -r -9 ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: prepare-package (Linux) - name: prepare-package (Linux)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@@ -148,16 +151,19 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
export DESTDIR=$(pwd)/dist export DESTDIR=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $DESTDIR cd $DESTDIR
tar -cjf ${{ matrix.artifacts_path }} * tar -cjf ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: "Upload GitHub Actions artifacts" - name: "Upload GitHub Actions artifacts"
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./dist/${{ matrix.artifacts_path }} path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
@@ -166,6 +172,6 @@ jobs:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}} aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
aws_bucket: pcem-dev-builds aws_bucket: pcem-dev-builds
source_dir: ./dist/${{ matrix.artifacts_path }} source_dir: ./artifacts
destination_dir: '' destination_dir: ''
endpoint: https://cdn.ntgecdn.com:443 endpoint: https://cdn.ntgecdn.com:443

View File

@@ -117,11 +117,14 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
run: | run: |
export INSTALL_PREFIX=$(pwd)/dist export INSTALL_PREFIX=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $INSTALL_PREFIX cd $INSTALL_PREFIX
ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin" ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
zip -r -9 ${{ matrix.artifacts_path }} * zip -r -9 ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: prepare-package (Linux) - name: prepare-package (Linux)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
export DESTDIR=$(pwd)/dist export DESTDIR=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $DESTDIR cd $DESTDIR
tar -cjf ${{ matrix.artifacts_path }} * tar -cjf ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./dist/${{ matrix.artifacts_path }} path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,6 @@ jobs:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}} aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
aws_bucket: pcem-dev-builds aws_bucket: pcem-dev-builds
source_dir: ./dist/${{ matrix.artifacts_path }} source_dir: ./artifacts
destination_dir: '' destination_dir: ''
endpoint: https://cdn.ntgecdn.com:443 endpoint: https://cdn.ntgecdn.com:443

View File

@@ -117,11 +117,14 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
run: | run: |
export INSTALL_PREFIX=$(pwd)/dist export INSTALL_PREFIX=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $INSTALL_PREFIX cd $INSTALL_PREFIX
ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin" ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
zip -r -9 ${{ matrix.artifacts_path }} * zip -r -9 ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: prepare-package (Linux) - name: prepare-package (Linux)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
export DESTDIR=$(pwd)/dist export DESTDIR=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $DESTDIR cd $DESTDIR
tar -cjf ${{ matrix.artifacts_path }} * tar -cjf ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./dist/${{ matrix.artifacts_path }} path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,6 @@ jobs:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}} aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
aws_bucket: pcem-dev-builds aws_bucket: pcem-dev-builds
source_dir: ./dist/${{ matrix.artifacts_path }} source_dir: ./artifacts
destination_dir: '' destination_dir: ''
endpoint: https://cdn.ntgecdn.com:443 endpoint: https://cdn.ntgecdn.com:443

View File

@@ -117,11 +117,14 @@ jobs:
shell: msys2 {0} shell: msys2 {0}
run: | run: |
export INSTALL_PREFIX=$(pwd)/dist export INSTALL_PREFIX=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $INSTALL_PREFIX cd $INSTALL_PREFIX
ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin" ntldd -R "bin/pcem.exe" | sed -e 's/^[[:blank:]]*//g' | cut -d ' ' -f 3 | grep -E -i '(mingw|clang)(32|64)' | sed -e 's|\\|/|g' | xargs cp --target-directory="bin"
zip -r -9 ${{ matrix.artifacts_path }} * zip -r -9 ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: prepare-package (Linux) - name: prepare-package (Linux)
if: runner.os == 'Linux' if: runner.os == 'Linux'
@@ -145,16 +148,19 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
export DESTDIR=$(pwd)/dist export DESTDIR=$(pwd)/dist
export ARTIFACTSDIR=$(pwd)/artifacts
mkdir -p $ARTIFACTSDIR
cd temp/build cd temp/build
ninja install ninja install
cd $DESTDIR cd $DESTDIR
tar -cjf ${{ matrix.artifacts_path }} * tar -cjf ${{ matrix.artifacts_path }} *
cp ${{ matrix.artifacts_path }} $ARTIFACTSDIR
- name: 'Upload GitHub Actions artifacts' - name: 'Upload GitHub Actions artifacts'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: with:
name: ${{ matrix.artifacts_name }} name: ${{ matrix.artifacts_name }}
path: ./dist/${{ matrix.artifacts_path }} path: ./artifacts
- name: Upload to NasuTek MinIO S3 - name: Upload to NasuTek MinIO S3
uses: shallwefootball/s3-upload-action@master uses: shallwefootball/s3-upload-action@master
@@ -163,6 +169,6 @@ jobs:
aws_key_id: ${{secrets.nte_cdn_s3_key_id}} aws_key_id: ${{secrets.nte_cdn_s3_key_id}}
aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}} aws_secret_access_key: ${{secrets.nte_cdn_s3_secret_access_key}}
aws_bucket: pcem-dev-builds aws_bucket: pcem-dev-builds
source_dir: ./dist/${{ matrix.artifacts_path }} source_dir: ./artifacts
destination_dir: '' destination_dir: ''
endpoint: https://cdn.ntgecdn.com:443 endpoint: https://cdn.ntgecdn.com:443