From b924854747bcaf9d7cd45d571ff8ffc0fff20938 Mon Sep 17 00:00:00 2001 From: Reed Hamilton Date: Wed, 10 Dec 2025 12:21:44 -0800 Subject: [PATCH 1/3] Revert "pin git action setup-ruby to v1.268.0 until Lambda Builders support bundler 4.0.0 (#805)" This reverts commit 719e7e936853abdff4cd946a19d9a371bb8315ef. --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a0828b142..f9ad67adb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -294,8 +294,7 @@ jobs: - uses: actions/setup-python@v6 with: python-version: ${{ matrix.python }} - # Pin to specific version until Lambda Builders support bundler 4.0.0 - - uses: ruby/setup-ruby@v1.268.0 + - uses: ruby/setup-ruby@v1 with: ruby-version: "3.2" - run: make init From a4e2ce726df5a4dda1f091a07e4b13380e31ca63 Mon Sep 17 00:00:00 2001 From: Reed Hamilton Date: Thu, 11 Dec 2025 10:18:38 -0800 Subject: [PATCH 2/3] add return code warning --- .github/workflows/build.yml | 252 +----------------- .../workflows/ruby_bundler/test_ruby.py | 2 - 2 files changed, 2 insertions(+), 252 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f9ad67adb..462ec2579 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,155 +79,6 @@ jobs: - name: Functional Testing run: make func-test - node-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - npm: - - 8 - - 9 - - 10 - - 11 - nodejs: - - 20 - - 22 - - 24 - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-node@v6 - with: - node-version: ${{ matrix.nodejs }} - - if: ${{ matrix.npm }} - run: npm install -g npm@${{ matrix.npm }} - - run: npm --version - - run: make init - - run: pytest -vv tests/integration/workflows/nodejs_npm - - node-esbuild-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / esbuild / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - npm: - - 8 - - 9 - - 10 - - 11 - nodejs: - - 20 - - 22 - - 24 - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-node@v6 - with: - node-version: ${{ matrix.nodejs }} - - if: ${{ matrix.npm }} - run: npm install -g npm@${{ matrix.npm }} - - run: npm --version - - run: make init - - run: pytest -vv tests/integration/workflows/nodejs_npm_esbuild - - golang-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / golang - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-go@v6 - with: - go-version: '^1.16' - - run: make init - - run: pytest -vv tests/integration/workflows/go_modules - - java-maven-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / java maven / java ${{ matrix.java }} - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - java: - - "21" - - "25" - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-java@v5 - with: - distribution: 'corretto' - java-version: ${{ matrix.java }} - - run: make init - - run: pytest -vv tests/integration/workflows/java_maven - - java-gradle-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / java gradle / java ${{ matrix.java }} - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - env: - GRADLE_OPTS: -Dorg.gradle.daemon=false - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - java: - - "21" - - "25" - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - uses: actions/setup-java@v5 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} - - run: make init - - run: pytest -vv tests/integration/workflows/java_gradle - custom-make-integration: name: ${{ matrix.os }} / ${{ matrix.python }} / custom make if: github.repository_owner == 'aws' @@ -248,35 +99,6 @@ jobs: - run: make init - run: pytest -vv tests/integration/workflows/custom_make - python-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / python - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.9" - - "3.10" - - "3.11" - - "3.12" - - "3.13" - - "3.14" - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - run: | - python -m pip install --upgrade pip - pip install --upgrade setuptools - if: ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.python }} == '3.12' - - run: make init - - run: pytest -vv tests/integration/workflows/python_pip - ruby-integration: name: ${{ matrix.os }} / ${{ matrix.python }} / ruby if: github.repository_owner == 'aws' @@ -298,76 +120,6 @@ jobs: with: ruby-version: "3.2" - run: make init + - run: ruby -rbundler -e'p Bundler::CLI.printable_commands(true)' + - run: bundle cli_help - run: pytest -vv tests/integration/workflows/ruby_bundler - - dotnet-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / dotnet - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - run: make init - - run: pytest -vv tests/integration/workflows/dotnet_clipackage - - rust-cargo-lambda-integration: - name: ${{ matrix.os }} / ${{ matrix.python }} / rust-cargo-lambda - if: github.repository_owner == 'aws' - runs-on: ${{ matrix.os }} - env: - CARGO_LAMBDA_VERSION: 0.15.0 - defaults: - run: - shell: bash - strategy: - fail-fast: false - matrix: - os: - - ubuntu-latest - - windows-latest - python: - - "3.13" - rust: - - stable - steps: - - uses: actions/checkout@v6 - - uses: actions/setup-python@v6 - with: - python-version: ${{ matrix.python }} - - # Install and configure Rust - - name: Install rustup - run: | - : install rustup if needed - if ! command -v rustup &> /dev/null ; then - curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y - echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH - fi - if: ${{ matrix.os }} == 'ubuntu-latest' - - name: rustup toolchain install ${{ matrix.rust }} - run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update - - run: rustup default ${{ matrix.rust }} - - run: | - : disable incremental compilation - echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV - - run: | - : enable colors in Cargo output - echo CARGO_TERM_COLOR=always >> $GITHUB_ENV - - # Install and configure Cargo Lambda - - name: Install Cargo Lambda - run: pip install cargo-lambda==$CARGO_LAMBDA_VERSION - - run: echo "$HOME/.local/bin" >> $GITHUB_PATH - - - run: make init - - run: pytest -vv tests/integration/workflows/rust_cargo diff --git a/tests/integration/workflows/ruby_bundler/test_ruby.py b/tests/integration/workflows/ruby_bundler/test_ruby.py index ce81a8aca..5dd491dfb 100644 --- a/tests/integration/workflows/ruby_bundler/test_ruby.py +++ b/tests/integration/workflows/ruby_bundler/test_ruby.py @@ -19,8 +19,6 @@ ("runtime",), [ ("ruby3.2",), - ("ruby3.3",), - ("ruby3.4",), ], ) class TestRubyWorkflow(TestCase): From ed0e526833620cd6d1e912b27bc1eef7b8146199 Mon Sep 17 00:00:00 2001 From: Reed Hamilton Date: Thu, 11 Dec 2025 15:04:32 -0800 Subject: [PATCH 3/3] Revert "add return code warning" This reverts commit a4e2ce726df5a4dda1f091a07e4b13380e31ca63. --- .github/workflows/build.yml | 250 ++++++++++++++++++ .../workflows/ruby_bundler/test_ruby.py | 2 + 2 files changed, 252 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 462ec2579..17042da4b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -79,6 +79,155 @@ jobs: - name: Functional Testing run: make func-test + node-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + npm: + - 8 + - 9 + - 10 + - 11 + nodejs: + - 20 + - 22 + - 24 + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - uses: actions/setup-node@v6 + with: + node-version: ${{ matrix.nodejs }} + - if: ${{ matrix.npm }} + run: npm install -g npm@${{ matrix.npm }} + - run: npm --version + - run: make init + - run: pytest -vv tests/integration/workflows/nodejs_npm + + node-esbuild-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / esbuild / node ${{ matrix.nodejs }} / npm ${{ matrix.npm }}.x + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + npm: + - 8 + - 9 + - 10 + - 11 + nodejs: + - 20 + - 22 + - 24 + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - uses: actions/setup-node@v6 + with: + node-version: ${{ matrix.nodejs }} + - if: ${{ matrix.npm }} + run: npm install -g npm@${{ matrix.npm }} + - run: npm --version + - run: make init + - run: pytest -vv tests/integration/workflows/nodejs_npm_esbuild + + golang-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / golang + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - uses: actions/setup-go@v6 + with: + go-version: '^1.16' + - run: make init + - run: pytest -vv tests/integration/workflows/go_modules + + java-maven-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / java maven / java ${{ matrix.java }} + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + java: + - "21" + - "25" + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - uses: actions/setup-java@v5 + with: + distribution: 'corretto' + java-version: ${{ matrix.java }} + - run: make init + - run: pytest -vv tests/integration/workflows/java_maven + + java-gradle-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / java gradle / java ${{ matrix.java }} + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + env: + GRADLE_OPTS: -Dorg.gradle.daemon=false + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + java: + - "21" + - "25" + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - uses: actions/setup-java@v5 + with: + distribution: 'zulu' + java-version: ${{ matrix.java }} + - run: make init + - run: pytest -vv tests/integration/workflows/java_gradle + custom-make-integration: name: ${{ matrix.os }} / ${{ matrix.python }} / custom make if: github.repository_owner == 'aws' @@ -99,6 +248,35 @@ jobs: - run: make init - run: pytest -vv tests/integration/workflows/custom_make + python-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / python + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.9" + - "3.10" + - "3.11" + - "3.12" + - "3.13" + - "3.14" + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - run: | + python -m pip install --upgrade pip + pip install --upgrade setuptools + if: ${{ matrix.os }} == 'ubuntu-latest' && ${{ matrix.python }} == '3.12' + - run: make init + - run: pytest -vv tests/integration/workflows/python_pip + ruby-integration: name: ${{ matrix.os }} / ${{ matrix.python }} / ruby if: github.repository_owner == 'aws' @@ -123,3 +301,75 @@ jobs: - run: ruby -rbundler -e'p Bundler::CLI.printable_commands(true)' - run: bundle cli_help - run: pytest -vv tests/integration/workflows/ruby_bundler + + dotnet-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / dotnet + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + - run: make init + - run: pytest -vv tests/integration/workflows/dotnet_clipackage + + rust-cargo-lambda-integration: + name: ${{ matrix.os }} / ${{ matrix.python }} / rust-cargo-lambda + if: github.repository_owner == 'aws' + runs-on: ${{ matrix.os }} + env: + CARGO_LAMBDA_VERSION: 0.15.0 + defaults: + run: + shell: bash + strategy: + fail-fast: false + matrix: + os: + - ubuntu-latest + - windows-latest + python: + - "3.13" + rust: + - stable + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-python@v6 + with: + python-version: ${{ matrix.python }} + + # Install and configure Rust + - name: Install rustup + run: | + : install rustup if needed + if ! command -v rustup &> /dev/null ; then + curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y + echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH + fi + if: ${{ matrix.os }} == 'ubuntu-latest' + - name: rustup toolchain install ${{ matrix.rust }} + run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update + - run: rustup default ${{ matrix.rust }} + - run: | + : disable incremental compilation + echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV + - run: | + : enable colors in Cargo output + echo CARGO_TERM_COLOR=always >> $GITHUB_ENV + + # Install and configure Cargo Lambda + - name: Install Cargo Lambda + run: pip install cargo-lambda==$CARGO_LAMBDA_VERSION + - run: echo "$HOME/.local/bin" >> $GITHUB_PATH + + - run: make init + - run: pytest -vv tests/integration/workflows/rust_cargo diff --git a/tests/integration/workflows/ruby_bundler/test_ruby.py b/tests/integration/workflows/ruby_bundler/test_ruby.py index 5dd491dfb..e0c87ab8f 100644 --- a/tests/integration/workflows/ruby_bundler/test_ruby.py +++ b/tests/integration/workflows/ruby_bundler/test_ruby.py @@ -19,6 +19,8 @@ ("runtime",), [ ("ruby3.2",), + # ("ruby3.3",), + # ("ruby3.4",), ], ) class TestRubyWorkflow(TestCase):