diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 78acfd6bed..5e0bbc5eb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,16 +8,11 @@ on: branches: - master - release-** - pull_request: - paths-ignore: - - "**.md" - - "channel.yaml" - - "install.sh" - - "!.github/workflows/test-suite.yaml" -name: Build +name: Branch Merge Build permissions: - contents: read + contents: write + id-token: write jobs: build-amd64: runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }},image=ubuntu22-full-x64,hdd=64 @@ -28,9 +23,18 @@ jobs: run: | curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper chmod +x /usr/local/bin/dapper + - name: "Read secrets" + uses: rancher-eio/read-vault-secrets@main + with: + secrets: | + secret/data/github/repo/${{ github.repository }}/aws-access-key-id/credentials token | AWS_ACCESS_KEY_ID ; + secret/data/github/repo/${{ github.repository }}/aws-secret-access-key/credentials token | AWS_SECRET_ACCESS_KEY ; - name: Build run: | dapper -f Dockerfile --target dapper make dapper-ci + env: + AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} - name: Test run: | dapper -f Dockerfile --target dapper make test @@ -43,7 +47,16 @@ jobs: run: | curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper chmod +x /usr/local/bin/dapper + - name: "Read secrets" + uses: rancher-eio/read-vault-secrets@main + with: + secrets: | + secret/data/github/repo/${{ github.repository }}/aws-access-key-id/credentials token | AWS_ACCESS_KEY_ID ; + secret/data/github/repo/${{ github.repository }}/aws-secret-access-key/credentials token | AWS_SECRET_ACCESS_KEY ; - name: Build run: | dapper -f Dockerfile --target dapper make dapper-ci + env: + AWS_ACCESS_KEY_ID: ${{ env.AWS_ACCESS_KEY_ID }} + AWS_SECRET_ACCESS_KEY: ${{ env.AWS_SECRET_ACCESS_KEY }} \ No newline at end of file diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml new file mode 100644 index 0000000000..3eb84d1e96 --- /dev/null +++ b/.github/workflows/pr.yml @@ -0,0 +1,40 @@ +on: + pull_request: + paths-ignore: + - "**.md" + - "channel.yaml" + - "install.sh" + - "!.github/workflows/test-suite.yaml" + +name: PR Build +permissions: + contents: read +jobs: + build-amd64: + runs-on: runs-on,runner=8cpu-linux-x64,run-id=${{ github.run_id }},image=ubuntu22-full-x64,hdd=64 + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Install Dapper + run: | + curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper + chmod +x /usr/local/bin/dapper + - name: Build + run: | + dapper -f Dockerfile --target dapper make dapper-ci + - name: Test + run: | + dapper -f Dockerfile --target dapper make test + build-arm64: + runs-on: runs-on,runner=8cpu-linux-arm64,run-id=${{ github.run_id }},image=ubuntu22-full-arm64,hdd=64 + steps: + - name: Checkout code + uses: actions/checkout@v4 + - name: Install Dapper + run: | + curl -sL https://releases.rancher.com/dapper/latest/dapper-$(uname -s)-$(uname -m) > /usr/local/bin/dapper + chmod +x /usr/local/bin/dapper + - name: Build + run: | + dapper -f Dockerfile --target dapper make dapper-ci + \ No newline at end of file