Skip to content

Commit

Permalink
Merge branch 'main' into 28.1.0-rc1
Browse files Browse the repository at this point in the history
  • Loading branch information
stevensoftware52 committed Oct 1, 2024
2 parents 49dfaf2 + 38c9d1d commit 63e5213
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
AWS_RELEASE_ACCESS_KEY_ID: ${{secrets.AWS_RELEASE_ACCESS_KEY_ID}}
AWS_RELEASE_SECRET_ACCESS_KEY: ${{secrets.AWS_RELEASE_SECRET_ACCESS_KEY}}
RELEASE_BUCKET: "slobs-cdn.streamlabs.com/obsplugin/intermediary_packages/"

jobs:
win64:
name: 'Windows 64-bit'
Expand All @@ -29,22 +29,22 @@ jobs:
uses: jwlawson/[email protected]
with:
cmake-version: '3.28.x'

- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Run build script
run: powershell -File ./ci/pipeline.ps1 "${{ github.workspace }}" "${{ github.sha }}"

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{secrets.AWS_RELEASE_ACCESS_KEY_ID}}
aws-secret-access-key: ${{secrets.AWS_RELEASE_SECRET_ACCESS_KEY}}
aws-region: us-west-2

- name: Upload Zip
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: slplugin-archive
path: ${{ github.workspace }}/slplugin-${{ env.SL_OBS_VERSION }}-${{ github.sha }}.7z
Expand All @@ -55,7 +55,7 @@ jobs:
environment: Release
needs: [win64]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Download Archive
uses: actions/download-artifact@v3
Expand All @@ -69,14 +69,14 @@ jobs:
run: powershell -File ./ci/sign.ps1 "${{ github.workspace }}" "${{ github.sha }}"

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
uses: aws-actions/configure-aws-credentials@v2
with:
aws-access-key-id: ${{secrets.AWS_RELEASE_ACCESS_KEY_ID}}
aws-secret-access-key: ${{secrets.AWS_RELEASE_SECRET_ACCESS_KEY}}
aws-region: us-west-2

- name: Upload zip to AWS Intermediary
run: aws s3 cp slplugin-${{env.SL_OBS_VERSION}}-${{ github.sha }}-signed.zip s3://${{env.RELEASE_BUCKET}} --acl public-read

- name: Upload installer to AWS Intermediary
run: aws s3 cp slplugin-${{env.SL_OBS_VERSION}}-${{ github.sha }}-signed.exe s3://${{env.RELEASE_BUCKET}} --acl public-read

0 comments on commit 63e5213

Please sign in to comment.