From a96b93bdefdb277496b02c523219b13438ccfd3c Mon Sep 17 00:00:00 2001 From: Cory Smith Date: Tue, 6 Sep 2022 13:19:27 -0500 Subject: [PATCH] Adding 'publish' to ci. --- .ci/common-exclusion.list | 1 + .ci/deploy.ps1 | 2 +- .ci/deploy.sh | 8 ++++---- .github/workflows/release.yml | 12 ++++++++++++ 4 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.ci/common-exclusion.list b/.ci/common-exclusion.list index 6e9890917..92d9c1b7d 100644 --- a/.ci/common-exclusion.list +++ b/.ci/common-exclusion.list @@ -1,4 +1,5 @@ .ci +.vscode .travis .travis.yml appveyor.yml diff --git a/.ci/deploy.ps1 b/.ci/deploy.ps1 index 016c33693..2b0e43f38 100644 --- a/.ci/deploy.ps1 +++ b/.ci/deploy.ps1 @@ -9,4 +9,4 @@ $Filename = "qb64_development_win-${Env:PLATFORM}.7z" $Dirname = "qb64" Set-Location .. 7z a "-xr@${Dirname}\.ci\common-exclusion.list" "-xr@${Dirname}\.ci\win-exclusion.list" $Filename $Dirname -aws --endpoint-url ${Env:S3_ENDPOINT} s3api put-object --bucket ${Bucket} --body $Filename --acl public-read --key development-builds/$Filename +# aws --endpoint-url ${Env:S3_ENDPOINT} s3api put-object --bucket ${Bucket} --body $Filename --acl public-read --key development-builds/$Filename diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 486cbd9e5..4f87b7535 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -8,9 +8,9 @@ dirname="qb64_${now}_`echo ${GITHUB_SHA} | sed 's/\(.......\).*$/\1/'`_${OS}" cd .. mv qb64 "${dirname}" tar --create --auto-compress --file ${filename} --exclude-from=${dirname}/.ci/common-exclusion.list --exclude-from=${dirname}/.ci/$OS-exclusion.list ${dirname} -aws --endpoint-url ${S3_ENDPOINT} s3api put-object --bucket ${BUCKET} --body ${filename} --acl public-read --key development-builds/${filename} -if [[ $OS == lnx ]]; then - aws --endpoint-url ${S3_ENDPOINT} s3api put-object --bucket ${BUCKET} --body ${dirname}/CHANGELOG.md --acl public-read --key development-builds/changelog.md -fi +# aws --endpoint-url ${S3_ENDPOINT} s3api put-object --bucket ${BUCKET} --body ${filename} --acl public-read --key development-builds/${filename} +# if [[ $OS == lnx ]]; then +# aws --endpoint-url ${S3_ENDPOINT} s3api put-object --bucket ${BUCKET} --body ${dirname}/CHANGELOG.md --acl public-read --key development-builds/changelog.md +# fi # Move it back so the post-job cleanup doesn't complain mv "${dirname}" qb64 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6be300d44..eafcf9267 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -18,6 +18,9 @@ jobs: run: .ci/bootstrap.sh lnx - name: Compile run: .ci/compile.sh + - name: Publish + if: github.event_name == 'push' + run: .ci/deploy.sh lnx macos-build: runs-on: macos-latest @@ -28,6 +31,9 @@ jobs: run: .ci/bootstrap.sh osx - name: Compile run: .ci/compile.sh + - name: Publish + if: github.event_name == 'push' + run: .ci/deploy.sh osx windows-x86-build: runs-on: windows-latest @@ -40,6 +46,9 @@ jobs: run: .ci/bootstrap.bat - name: Compile run: .ci/compile.bat + - name: Publish + if: github.event_name == 'push' + run: .ci/deploy.ps1 windows-x64-build: runs-on: windows-latest @@ -52,3 +61,6 @@ jobs: run: .ci/bootstrap.bat - name: Compile run: .ci/compile.bat + - name: Publish + if: github.event_name == 'push' + run: .ci/deploy.ps1