|
31 | 31 | jobs: |
32 | 32 | integration-tests: |
33 | 33 | # Only run scheduled jobs on the main aws/aws-sam-cli repository, not on forks |
34 | | - if: github.event_name != 'schedule' || github.repository == 'aws/aws-sam-cli-skip' |
| 34 | + # if: github.event_name != 'schedule' || github.repository == 'aws/aws-sam-cli' |
| 35 | + if: github.repository == 'aws/aws-sam-cli-skip' |
35 | 36 | name: ${{ matrix.test_suite }} (${{ matrix.container_runtime }}) |
36 | 37 | runs-on: ubuntu-22.04 |
37 | 38 | strategy: |
@@ -663,13 +664,22 @@ jobs: |
663 | 664 | if: contains(fromJSON('["build-integ", "build-integ-java-python-provided", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container' |
664 | 665 | shell: bash |
665 | 666 | run: | |
666 | | - curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL https://sh.rustup.rs | sh -s -- --default-toolchain none -y |
667 | | - source "$HOME/.cargo/env" |
| 667 | + # On Windows runners, Rust is pre-installed; just ensure toolchain is configured |
| 668 | + if command -v rustup &> /dev/null; then |
| 669 | + echo "rustup already available, updating toolchain..." |
| 670 | + else |
| 671 | + curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL https://sh.rustup.rs | sh -s -- --default-toolchain none -y |
| 672 | + # Source cargo env only on non-Windows (file doesn't exist on Windows) |
| 673 | + if [ -f "$HOME/.cargo/env" ]; then |
| 674 | + source "$HOME/.cargo/env" |
| 675 | + fi |
| 676 | + fi |
668 | 677 | rustup toolchain install stable --profile minimal --no-self-update |
669 | 678 | rustup default stable |
670 | | - rustup target add x86_64-unknown-linux-gnu --toolchain stable |
671 | | - rustup target add aarch64-unknown-linux-gnu --toolchain stable |
672 | | - echo "$HOME/.cargo/bin" >> $GITHUB_PATH |
| 679 | + # Add cross-compilation targets (may not all be available on Windows but won't fail) |
| 680 | + rustup target add x86_64-unknown-linux-gnu --toolchain stable || true |
| 681 | + rustup target add aarch64-unknown-linux-gnu --toolchain stable || true |
| 682 | + echo "$USERPROFILE\\.cargo\\bin" >> $GITHUB_PATH || echo "$HOME/.cargo/bin" >> $GITHUB_PATH |
673 | 683 |
|
674 | 684 | - name: Install cargo-lambda |
675 | 685 | if: contains(fromJSON('["build-integ", "build-integ-java-python-provided", "build-integ-arm64"]'), matrix.test_suite) && matrix.container_runtime == 'no-container' |
|
0 commit comments