diff --git a/.ci/deploy.sh b/.ci/deploy.sh index 50fc2d8b6..f8b1c77cd 100755 --- a/.ci/deploy.sh +++ b/.ci/deploy.sh @@ -9,6 +9,6 @@ tar --create --auto-compress --file ${filename} --exclude-from=qb64/.ci/common-e current_files=$(aws --output text --query 'Contents[].Key' s3api list-objects --bucket ${BUCKET} --prefix ${OS}) aws s3 cp ${filename} s3://${BUCKET}/${OS}/ -for f in current_files; do +for f in $current_files; do aws s3 rm s3://${BUCKET}/$f done diff --git a/.github/workflows/run.yml b/.github/workflows/run.yml index c5906c366..6d36c81e1 100644 --- a/.github/workflows/run.yml +++ b/.github/workflows/run.yml @@ -38,24 +38,21 @@ jobs: macos-build: runs-on: macos-latest - if: "contains(github.event.head_commit.message, 'ci-skip')" + if: "!contains(github.event.head_commit.message, 'ci-skip')" steps: - uses: actions/checkout@v2 - name: Bootstrap compiler run: .ci/bootstrap.sh osx - name: Compile run: .ci/compile.sh - - name: Set deployment SSH key + - name: Setup aws if: github.event_name == 'push' - uses: shimataro/ssh-key-action@v2.1.0 + uses: aws-actions/configure-aws-credentials@v1 with: - key: ${{ secrets.SSH_KEY }} - known_hosts: ${{ secrets.KNOWN_HOSTS }} - config: | - Host remote-server - HostName qb64.org - User m6rosupy1q2t - - name: Package and deploy + aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} + aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + aws-region: us-east-2 + - name: Publish to S3 if: github.event_name == 'push' run: .ci/deploy.sh osx