From cb0d4be0bd1bd383f663691f66957d0bf1676793 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 2 Apr 2025 15:25:02 -0700 Subject: [PATCH 001/135] whitespace change --- .github/workflows/run-unit-tests.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 7829c6d9..a9c7365e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -2,7 +2,6 @@ # For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions name: UnitTestCoverage - on: push: branches: [ master ] @@ -11,14 +10,12 @@ on: jobs: build: - runs-on: ${{ matrix.os }} strategy: fail-fast: false matrix: python-version: [3.8, 3.9, "3.10", 3.11] os: [ubuntu-latest, macOS-latest, windows-latest ] - steps: - uses: actions/checkout@v2 - name: Set up Python ${{ matrix.python-version }} From 478ed5be0a2abb299fd6356f0faef31ca57133b4 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 3 Apr 2025 11:42:30 -0700 Subject: [PATCH 002/135] added premilinary build-java job --- .github/workflows/run-unit-tests.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index a9c7365e..99691dfb 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -30,3 +30,23 @@ jobs: - name: Test with pytest run: | pytest + build-java: + needs: [build] + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + python-version: [ 3.8, 3.9, 3.10, 3.11 ] + os: [ ubuntu-latest, macOS-latest, windows-latest ] + steps: + - uses: actions/checkout@v2 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v2 + with: + python-version: ${{ matrix.python-version }} + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'corretto' From 95ee9ede3e3b6c2ec37a7933ea886b4516340773 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 3 Apr 2025 11:44:55 -0700 Subject: [PATCH 003/135] added java-build-tests to push branches monitoring --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 99691dfb..9734de3f 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master ] + branches: [ master, java-build-tests ] pull_request: branches: [ master ] From fd037660bbabc0a2dfddda5cae73cb87ea53671f Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 3 Apr 2025 11:48:12 -0700 Subject: [PATCH 004/135] change 3.10 back to '3.10' --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9734de3f..5fc81a4b 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -36,7 +36,7 @@ jobs: strategy: fail-fast: true matrix: - python-version: [ 3.8, 3.9, 3.10, 3.11 ] + python-version: [ 3.8, 3.9, "3.10", 3.11 ] os: [ ubuntu-latest, macOS-latest, windows-latest ] steps: - uses: actions/checkout@v2 @@ -50,3 +50,4 @@ jobs: with: java-version: '8' distribution: 'corretto' + From 2b2ad8da21e9a4dd0c63d05abfa82a7e75db8a29 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 3 Apr 2025 12:00:43 -0700 Subject: [PATCH 005/135] Added jar download commands --- .github/workflows/run-unit-tests.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 5fc81a4b..fe0b2f06 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -50,4 +50,9 @@ jobs: with: java-version: '8' distribution: 'corretto' + - name: Install jar files + run: | + python setup.py download_jars + python setup.py install + echo "Jar commands have been run" From 1357dfc07fd5e79726fe7433b77ae362513d8f7f Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 4 Apr 2025 11:53:17 -0700 Subject: [PATCH 006/135] removed echo statement --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index fe0b2f06..9a833e38 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -54,5 +54,4 @@ jobs: run: | python setup.py download_jars python setup.py install - echo "Jar commands have been run" From 1ad30606a7425b3ff0dae44a1150912a8573e648 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 4 Apr 2025 12:00:17 -0700 Subject: [PATCH 007/135] added wordputter command --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9a833e38..3a66984d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -54,4 +54,5 @@ jobs: run: | python setup.py download_jars python setup.py install + sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster From ce3b33048b93761b96f2a55366602e743c931f51 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 4 Apr 2025 12:03:04 -0700 Subject: [PATCH 008/135] added pip install boto3 --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3a66984d..41e57608 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -54,5 +54,6 @@ jobs: run: | python setup.py download_jars python setup.py install + pip install boto3 sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster From 36cdb4b1d9c0f041f5ab5fb0a8d4ab1951cc2120 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 4 Apr 2025 12:07:08 -0700 Subject: [PATCH 009/135] add pip install documents --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 41e57608..8571aa7f 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -52,8 +52,10 @@ jobs: distribution: 'corretto' - name: Install jar files run: | + python -m pip install --upgrade pip + pip install -r requirements.txt + pip install -r test_requirements.txt python setup.py download_jars python setup.py install - pip install boto3 sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster From fc9ded61895c584c28fe607fa836992f1fb43e40 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 4 Apr 2025 12:09:22 -0700 Subject: [PATCH 010/135] separate dependencies and jar files into different job subsections --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 8571aa7f..f83b4fd1 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -50,11 +50,13 @@ jobs: with: java-version: '8' distribution: 'corretto' - - name: Install jar files + - name: Install dependencies run: | python -m pip install --upgrade pip pip install -r requirements.txt pip install -r test_requirements.txt + - name: Install jar files + run: | python setup.py download_jars python setup.py install sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster From 8ed1af977d4735a6c56324724accf153a541a256 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 09:31:15 -0700 Subject: [PATCH 011/135] added extra animal --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f83b4fd1..731a9c54 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -59,5 +59,5 @@ jobs: run: | python setup.py download_jars python setup.py install - sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster + sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus From 6fc13cb1622bad84f4145794f64f956700fa0a34 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 10:11:09 -0700 Subject: [PATCH 012/135] add aws credentials --- .github/workflows/run-unit-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 731a9c54..6c486cce 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -59,5 +59,8 @@ jobs: run: | python setup.py download_jars python setup.py install + $(( AWS_CRED )) sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus + env: + AWS_CRED: $(( secrets.AWS_CREDS )) From 95599d701f55ede53bd31f51581f9eef91ffbd1b Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 10:24:28 -0700 Subject: [PATCH 013/135] removed 0 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6c486cce..133697d9 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -59,7 +59,7 @@ jobs: run: | python setup.py download_jars python setup.py install - $(( AWS_CRED )) + AWS_CRED sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus env: AWS_CRED: $(( secrets.AWS_CREDS )) From 17f8648ee7f02d4fc5dd5bbecba87d7de2c1edec Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 10:55:18 -0700 Subject: [PATCH 014/135] changed reference for AWS_CRED --- .github/workflows/run-unit-tests.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 133697d9..3452b567 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -56,11 +56,12 @@ jobs: pip install -r requirements.txt pip install -r test_requirements.txt - name: Install jar files + env: + AWS_CRED: $(( secrets.AWS_CREDS )) run: | python setup.py download_jars python setup.py install - AWS_CRED + ${{ AWS_CRED }} sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus - env: - AWS_CRED: $(( secrets.AWS_CREDS )) + From 761fc3e73744ed439873fd905cab97f2d955549b Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 10:59:08 -0700 Subject: [PATCH 015/135] changed reference for AWS_CRED 2 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3452b567..454521d3 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -61,7 +61,7 @@ jobs: run: | python setup.py download_jars python setup.py install - ${{ AWS_CRED }} + "$AWS_CRED" sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus From 13ec27a3da4624e8fe15f03cea8d944207c357f8 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 12:05:50 -0700 Subject: [PATCH 016/135] add backticks around env declaration --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 454521d3..a5bf81bf 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -57,7 +57,7 @@ jobs: pip install -r test_requirements.txt - name: Install jar files env: - AWS_CRED: $(( secrets.AWS_CREDS )) + AWS_CRED: `$(( secrets.AWS_CREDS ))` run: | python setup.py download_jars python setup.py install From 588d96e13ab6184ca93e874195dace0a14fd46d6 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 12:07:00 -0700 Subject: [PATCH 017/135] add backticks around run cmd --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index a5bf81bf..cb918da3 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -57,11 +57,11 @@ jobs: pip install -r test_requirements.txt - name: Install jar files env: - AWS_CRED: `$(( secrets.AWS_CREDS ))` + AWS_CRED: $(( secrets.AWS_CREDS )) run: | python setup.py download_jars python setup.py install - "$AWS_CRED" + `"$AWS_CRED"` sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus From 17986a437461307f6932e4d80f18eebe7c494a27 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 12:10:14 -0700 Subject: [PATCH 018/135] correct syntax for secrets --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index cb918da3..2eecc770 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -57,11 +57,11 @@ jobs: pip install -r test_requirements.txt - name: Install jar files env: - AWS_CRED: $(( secrets.AWS_CREDS )) + AWS_CRED: ${{ secrets.AWS_CREDS }} run: | python setup.py download_jars python setup.py install - `"$AWS_CRED"` + "$AWS_CRED" sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus From 7b31492c6ad06d26a48647052994f7f833259c56 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 14:32:20 -0700 Subject: [PATCH 019/135] added maven build job --- .github/workflows/run-unit-tests.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 2eecc770..ad921a46 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -30,7 +30,18 @@ jobs: - name: Test with pytest run: | pytest - build-java: + build-maven: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'corretto' + - name: Build with Maven + run: mvn -B package --file pom.xml -DskipITs + running_sample: needs: [build] runs-on: ${{ matrix.os }} strategy: From 87500d9b0998387f5d707cc5447f1580178a4646 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 7 Apr 2025 16:17:25 -0700 Subject: [PATCH 020/135] comment unnecessary tests --- .github/workflows/run-unit-tests.yml | 60 +++++++++++----------------- 1 file changed, 24 insertions(+), 36 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ad921a46..48451c61 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -9,40 +9,29 @@ on: branches: [ master ] jobs: - build: - runs-on: ${{ matrix.os }} - strategy: - fail-fast: false - matrix: - python-version: [3.8, 3.9, "3.10", 3.11] - os: [ubuntu-latest, macOS-latest, windows-latest ] - steps: - - uses: actions/checkout@v2 - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 - with: - python-version: ${{ matrix.python-version }} - - name: Install dependencies - run: | - python -m pip install --upgrade pip - pip install -r requirements.txt - pip install -r test_requirements.txt - - name: Test with pytest - run: | - pytest - build-maven: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - name: Set up JDK 8 - uses: actions/setup-java@v4 - with: - java-version: '8' - distribution: 'corretto' - - name: Build with Maven - run: mvn -B package --file pom.xml -DskipITs +# build: +# runs-on: ${{ matrix.os }} +# strategy: +# fail-fast: false +# matrix: +# python-version: [3.8, 3.9, "3.10", 3.11] +# os: [ubuntu-latest, macOS-latest, windows-latest ] +# steps: +# - uses: actions/checkout@v2 +# - name: Set up Python ${{ matrix.python-version }} +# uses: actions/setup-python@v2 +# with: +# python-version: ${{ matrix.python-version }} +# - name: Install dependencies +# run: | +# python -m pip install --upgrade pip +# pip install -r requirements.txt +# pip install -r test_requirements.txt +# - name: Test with pytest +# run: | +# pytest running_sample: - needs: [build] + # needs: [build] runs-on: ${{ matrix.os }} strategy: fail-fast: true @@ -50,7 +39,8 @@ jobs: python-version: [ 3.8, 3.9, "3.10", 3.11 ] os: [ ubuntu-latest, macOS-latest, windows-latest ] steps: - - uses: actions/checkout@v2 + - name: Checkout + uses: actions/checkout@v4 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: @@ -74,5 +64,3 @@ jobs: python setup.py install "$AWS_CRED" sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus - - From a852c78d091d9ed8d12b5c3b88f1e979aab6f016 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 8 Apr 2025 10:21:21 -0700 Subject: [PATCH 021/135] add permissions branch --- .github/workflows/run-unit-tests.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 48451c61..e7129ab1 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -8,6 +8,10 @@ on: pull_request: branches: [ master ] +permissions: + id-token: write + contents: read + jobs: # build: # runs-on: ${{ matrix.os }} @@ -45,7 +49,6 @@ jobs: uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} - - uses: actions/checkout@v4 - name: Set up JDK 8 uses: actions/setup-java@v4 with: From aec8760cc4edaa5d63fb4f77ff6f3870c31210db Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 8 Apr 2025 11:46:17 -0700 Subject: [PATCH 022/135] add AWS credentials provider --- .github/workflows/run-unit-tests.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index e7129ab1..dae1fe85 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -45,6 +45,12 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Configure AWS Credentials + uses: aws-actions/configure-aws-credentials@v4 + with: + role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_GHWF }} + role-session-name: myGitHubActions + aws-region: us-east-1 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: @@ -65,5 +71,4 @@ jobs: run: | python setup.py download_jars python setup.py install - "$AWS_CRED" sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus From 22385c3f7d6d718d0100bb2207e055b01071a123 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 8 Apr 2025 12:28:37 -0700 Subject: [PATCH 023/135] switched region around --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index dae1fe85..39cee4ab 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -48,9 +48,9 @@ jobs: - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: + aws-region: us-east-1 role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_GHWF }} role-session-name: myGitHubActions - aws-region: us-east-1 - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From 062e42988736995111ca8ccf96c45e185d0fc558 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 9 Apr 2025 15:09:35 -0700 Subject: [PATCH 024/135] separate sample word putter into separate function --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 39cee4ab..f06ba463 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -71,4 +71,6 @@ jobs: run: | python setup.py download_jars python setup.py install - sample_kinesis_wordputter.py --stream words -w cat -w dog -w bird -w lobster -w octopus + - name: Put words to sample stream + run: | + sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From efeed04a0cce0900c0bd0359fa90ca26f7a830d0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 9 Apr 2025 15:50:02 -0700 Subject: [PATCH 025/135] added -p 8 flag to sample word putter --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f06ba463..c360c478 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -73,4 +73,4 @@ jobs: python setup.py install - name: Put words to sample stream run: | - sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus -p 8 From 16e697a7348fdab1f43483a291e2281f4fd05956 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 9 Apr 2025 16:55:06 -0700 Subject: [PATCH 026/135] add whitespace and remove reduncant credential caller --- .github/workflows/run-unit-tests.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index c360c478..5e092d06 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -45,32 +45,35 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Configure AWS Credentials uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-east-1 role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_GHWF }} role-session-name: myGitHubActions + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: python-version: ${{ matrix.python-version }} + - name: Set up JDK 8 uses: actions/setup-java@v4 with: java-version: '8' distribution: 'corretto' - - name: Install dependencies + + - name: Install Python and required pips run: | python -m pip install --upgrade pip pip install -r requirements.txt pip install -r test_requirements.txt + - name: Install jar files - env: - AWS_CRED: ${{ secrets.AWS_CREDS }} run: | python setup.py download_jars python setup.py install + - name: Put words to sample stream - run: | - sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus -p 8 + run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From 26548a07efd4db6f311474f7be064542ef9ad0ca Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 9 Apr 2025 17:00:29 -0700 Subject: [PATCH 027/135] Added sample kinesis app command --- .github/workflows/run-unit-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 5e092d06..d1c66f61 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -77,3 +77,7 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + + - name: Start KCL application + run: `amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties` + From adcde6da57edde3e1abd93290656e931b2785fcf Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 9 Apr 2025 17:01:41 -0700 Subject: [PATCH 028/135] removed backticks --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index d1c66f61..bc1dc43d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -79,5 +79,5 @@ jobs: run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Start KCL application - run: `amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties` + run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties From dac1e9828cafb23923e7ecf24684166d7635ee07 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 09:47:19 -0700 Subject: [PATCH 029/135] add backslashes to escape backticks --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index bc1dc43d..7cde4a55 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -78,6 +78,7 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + #backtocks didn't work on the command? raises an error in workflows, just prints the command without the backticks - name: Start KCL application - run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + run: \`amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties\` From fd86b7440f118bbcb28265f94e1e57a9b7ff5e75 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 09:55:38 -0700 Subject: [PATCH 030/135] changed backticks to $ format --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 7cde4a55..dc4803c5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -80,5 +80,5 @@ jobs: #backtocks didn't work on the command? raises an error in workflows, just prints the command without the backticks - name: Start KCL application - run: \`amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties\` + run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From f8069b62340126e078a2472d888b3ac1dbef1fca Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 09:58:02 -0700 Subject: [PATCH 031/135] narrow down test matrix --- .github/workflows/run-unit-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index dc4803c5..3d336af6 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -40,8 +40,10 @@ jobs: strategy: fail-fast: true matrix: - python-version: [ 3.8, 3.9, "3.10", 3.11 ] - os: [ ubuntu-latest, macOS-latest, windows-latest ] +# python-version: [ 3.8, 3.9, "3.10", 3.11 ] +# os: [ ubuntu-latest, macOS-latest, windows-latest ] + python-version: [ 3.8, 3.9 ] + os: [ ubuntu-latest, macOS-latest ] steps: - name: Checkout uses: actions/checkout@v4 From a4cc8c0f5b1da5163ec9abf2175dff90e87985bb Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:00:07 -0700 Subject: [PATCH 032/135] comment out KCL app function --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3d336af6..f401b6a5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -81,6 +81,6 @@ jobs: run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus #backtocks didn't work on the command? raises an error in workflows, just prints the command without the backticks - - name: Start KCL application - run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) +# - name: Start KCL application +# run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From 810fc6d21750ad6f31d129a6db44f148a8b9ac56 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:06:41 -0700 Subject: [PATCH 033/135] remove install cmd --- .github/workflows/run-unit-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f401b6a5..41b75947 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -38,7 +38,7 @@ jobs: # needs: [build] runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false matrix: # python-version: [ 3.8, 3.9, "3.10", 3.11 ] # os: [ ubuntu-latest, macOS-latest, windows-latest ] @@ -73,9 +73,11 @@ jobs: pip install -r test_requirements.txt - name: Install jar files +# run: | +# python setup.py download_jars +# python setup.py install run: | python setup.py download_jars - python setup.py install - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From 0e7de53a132e9d50936dd5a0d73321f649a9d29f Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:08:38 -0700 Subject: [PATCH 034/135] add install cmd --- .github/workflows/run-unit-tests.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 41b75947..6221666b 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -73,11 +73,9 @@ jobs: pip install -r test_requirements.txt - name: Install jar files -# run: | -# python setup.py download_jars -# python setup.py install run: | python setup.py download_jars + python setup.py install - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From a69af4024d6d614696bf7351a73c20ecf3bfa2fb Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:16:29 -0700 Subject: [PATCH 035/135] revert to previously working commit --- .github/workflows/run-unit-tests.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6221666b..bc1dc43d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -38,12 +38,10 @@ jobs: # needs: [build] runs-on: ${{ matrix.os }} strategy: - fail-fast: false + fail-fast: true matrix: -# python-version: [ 3.8, 3.9, "3.10", 3.11 ] -# os: [ ubuntu-latest, macOS-latest, windows-latest ] - python-version: [ 3.8, 3.9 ] - os: [ ubuntu-latest, macOS-latest ] + python-version: [ 3.8, 3.9, "3.10", 3.11 ] + os: [ ubuntu-latest, macOS-latest, windows-latest ] steps: - name: Checkout uses: actions/checkout@v4 @@ -80,7 +78,6 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - #backtocks didn't work on the command? raises an error in workflows, just prints the command without the backticks -# - name: Start KCL application -# run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + - name: Start KCL application + run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties From 82eb9c72fdda0acc983c256c18be95d2f8042bfd Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:26:39 -0700 Subject: [PATCH 036/135] add pytest --- .github/workflows/run-unit-tests.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index bc1dc43d..004c1389 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -70,6 +70,10 @@ jobs: pip install -r requirements.txt pip install -r test_requirements.txt + - name: Test with pytest + run: | + pytest + - name: Install jar files run: | python setup.py download_jars From b8bb4848d9d6edef00d91364fea4e30eee905a1a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 10:28:41 -0700 Subject: [PATCH 037/135] fast fail off --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 004c1389..172b7819 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -38,7 +38,7 @@ jobs: # needs: [build] runs-on: ${{ matrix.os }} strategy: - fail-fast: true + fail-fast: false matrix: python-version: [ 3.8, 3.9, "3.10", 3.11 ] os: [ ubuntu-latest, macOS-latest, windows-latest ] From a53c9f3a0cbce177745e0a4f63ade26c5344ff11 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 11:16:32 -0700 Subject: [PATCH 038/135] reverse order of jar faile installation --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 172b7819..c2c294dc 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -76,8 +76,8 @@ jobs: - name: Install jar files run: | - python setup.py download_jars python setup.py install + python setup.py download_jars - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From e0b893dff26299d51c92745797264668ebcd80d9 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 11:20:19 -0700 Subject: [PATCH 039/135] expand helper command to run --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index c2c294dc..3ef1a7cc 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -75,6 +75,7 @@ jobs: pytest - name: Install jar files + # rerun python setup.py install at the end if jars download incorrectly run: | python setup.py install python setup.py download_jars @@ -83,5 +84,5 @@ jobs: run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Start KCL application - run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From 9cee36839213abd881d0526c8ce499bdf85cc595 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Thu, 10 Apr 2025 11:46:52 -0700 Subject: [PATCH 040/135] separate branch for windows and macos/ubuntu --- .github/workflows/run-unit-tests.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3ef1a7cc..17f39313 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -83,6 +83,13 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: Start KCL application - run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + - name: Start KCL application ubuntu and macOS + if: matrix.os == 'windows-latest' + run: echo 'Windows version' + # fix run command for windows + # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + - name: Start KCL application windows + if: matrix.os != 'windows-latest' + run: echo 'ubuntu or macOS' + # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From b8e8e17c5acbc135cdca07935e15d9ed68383af1 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 09:50:04 -0700 Subject: [PATCH 041/135] separating os versions --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 17f39313..6baa5b62 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -91,5 +91,4 @@ jobs: - name: Start KCL application windows if: matrix.os != 'windows-latest' - run: echo 'ubuntu or macOS' # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From 7571cf02f80c07337010315f73c4d80b7372e6e8 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:18:27 -0700 Subject: [PATCH 042/135] add timeout to running_sample job --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6baa5b62..acf7c72a 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -37,6 +37,7 @@ jobs: running_sample: # needs: [build] runs-on: ${{ matrix.os }} + timeout-minutes: 3 strategy: fail-fast: false matrix: From 80e36ff7c6c6ca19c3eeb5025bc854a9b9a40042 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:20:13 -0700 Subject: [PATCH 043/135] enable kcl app for non-window versions --- .github/workflows/run-unit-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index acf7c72a..21add615 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -84,12 +84,12 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: Start KCL application ubuntu and macOS + - name: Start KCL application windows if: matrix.os == 'windows-latest' run: echo 'Windows version' # fix run command for windows # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) - - name: Start KCL application windows + - name: Start KCL application ubuntu and macOS if: matrix.os != 'windows-latest' - # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) From 7f0e1d9037b34bd72b8a25ceccd50b4721fca699 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:30:58 -0700 Subject: [PATCH 044/135] add timeout sections --- .github/workflows/run-unit-tests.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 21add615..5e827c5d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -37,7 +37,7 @@ jobs: running_sample: # needs: [build] runs-on: ${{ matrix.os }} - timeout-minutes: 3 + timeout-minutes: 5 strategy: fail-fast: false matrix: @@ -85,11 +85,15 @@ jobs: run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Start KCL application windows + timeout-minutes: 1 if: matrix.os == 'windows-latest' run: echo 'Windows version' # fix run command for windows # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + # continue-on-error: true - name: Start KCL application ubuntu and macOS + timeout-minutes: 1 if: matrix.os != 'windows-latest' run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + # continue-on-error: true From f70008e8dd8479bfc87ff66dc8b5047c3cad65c9 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:39:55 -0700 Subject: [PATCH 045/135] narrow testing os versions --- .github/workflows/run-unit-tests.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 5e827c5d..4c9a1bc0 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -37,11 +37,13 @@ jobs: running_sample: # needs: [build] runs-on: ${{ matrix.os }} - timeout-minutes: 5 + # timeout-minutes: 5 strategy: fail-fast: false matrix: - python-version: [ 3.8, 3.9, "3.10", 3.11 ] +# python-version: [ 3.8, 3.9, "3.10", 3.11 ] +# os: [ ubuntu-latest, macOS-latest, windows-latest ] + python-version: [ "3.10", 3.11 ] os: [ ubuntu-latest, macOS-latest, windows-latest ] steps: - name: Checkout @@ -85,7 +87,7 @@ jobs: run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Start KCL application windows - timeout-minutes: 1 + # timeout-minutes: 1 if: matrix.os == 'windows-latest' run: echo 'Windows version' # fix run command for windows @@ -93,7 +95,7 @@ jobs: # continue-on-error: true - name: Start KCL application ubuntu and macOS - timeout-minutes: 1 + # timeout-minutes: 1 if: matrix.os != 'windows-latest' run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true From 26b6efbc8350935f76494552a605cca8536858b9 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:54:48 -0700 Subject: [PATCH 046/135] try timeout command --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 4c9a1bc0..f03e16a1 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -97,5 +97,6 @@ jobs: - name: Start KCL application ubuntu and macOS # timeout-minutes: 1 if: matrix.os != 'windows-latest' - run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: timeout 10 python $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; \ + if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true From b7ff503c8a8d96c9235b26021bee28d668d4edee Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 10:56:26 -0700 Subject: [PATCH 047/135] change cmd line syntax --- .github/workflows/run-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f03e16a1..2174ff03 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -97,6 +97,5 @@ jobs: - name: Start KCL application ubuntu and macOS # timeout-minutes: 1 if: matrix.os != 'windows-latest' - run: timeout 10 python $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; \ - if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + run: timeout 10 python $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true From d90a8216d658f107ef2b5d492f747166b06fb723 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 11:01:24 -0700 Subject: [PATCH 048/135] edit syntax of cmd --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 2174ff03..31ca6829 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -97,5 +97,5 @@ jobs: - name: Start KCL application ubuntu and macOS # timeout-minutes: 1 if: matrix.os != 'windows-latest' - run: timeout 10 python $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + run: timeout 10 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true From 048a70bb7ebc3fb788c4aa7064bb101dd1bd403a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 11:15:24 -0700 Subject: [PATCH 049/135] separating each OS into their own command --- .github/workflows/run-unit-tests.yml | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 31ca6829..2ab13dac 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -72,6 +72,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r test_requirements.txt + brew install coreutils - name: Test with pytest run: | @@ -86,16 +87,27 @@ jobs: - name: Put words to sample stream run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + #WIP + #Find Windows alternative to $( ) -> + #Find Windows alternative to timeout command (if necessary) - name: Start KCL application windows - # timeout-minutes: 1 + timeout-minutes: 1 if: matrix.os == 'windows-latest' run: echo 'Windows version' - # fix run command for windows # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true - - name: Start KCL application ubuntu and macOS + #working as intended + - name: Start KCL application ubuntu # timeout-minutes: 1 - if: matrix.os != 'windows-latest' - run: timeout 10 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + if: matrix.os == 'ubuntu-latest' + run: timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + # continue-on-error: true + + #WIP + #Find macOS alternative to timeout command + - name: Start KCL application macOS + timeout-minutes: 1 + if: matrix.os == 'macOS-latest' + run: gtimeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true From 537d02b2ac6c2524f7e12d4fc5bc820b8eb69ddb Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 11:18:44 -0700 Subject: [PATCH 050/135] move brew install to macOS section --- .github/workflows/run-unit-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 2ab13dac..3f47615c 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -72,7 +72,6 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r test_requirements.txt - brew install coreutils - name: Test with pytest run: | @@ -109,5 +108,7 @@ jobs: - name: Start KCL application macOS timeout-minutes: 1 if: matrix.os == 'macOS-latest' - run: gtimeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + run: | + brew install coreutils + gtimeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true From b5444943ab18bb59187e5031339b8a33ee035bc5 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 11:59:08 -0700 Subject: [PATCH 051/135] windows version tests --- .github/workflows/run-unit-tests.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3f47615c..ed9ed47e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -90,25 +90,20 @@ jobs: #Find Windows alternative to $( ) -> #Find Windows alternative to timeout command (if necessary) - name: Start KCL application windows - timeout-minutes: 1 + timeout-minutes: 2 if: matrix.os == 'windows-latest' - run: echo 'Windows version' - # run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + # run: echo 'Windows version' + run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true #working as intended - name: Start KCL application ubuntu - # timeout-minutes: 1 if: matrix.os == 'ubuntu-latest' run: timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - # continue-on-error: true - #WIP - #Find macOS alternative to timeout command + #working as intended - name: Start KCL application macOS - timeout-minutes: 1 if: matrix.os == 'macOS-latest' run: | brew install coreutils gtimeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - # continue-on-error: true From bafaf741813f97c52fce0c0af59284f7969a6d09 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 12:09:46 -0700 Subject: [PATCH 052/135] sample_putter separate for windows version --- .github/workflows/run-unit-tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ed9ed47e..20d15ef2 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -83,8 +83,15 @@ jobs: python setup.py install python setup.py download_jars + #Make windows/non-windows version - name: Put words to sample stream - run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + steps: + - name: is_windows_os + if: matrix.os == 'windows-latest' + run: python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + - name: is_not_windows_os + if: matrix.os != 'windows-latest' + run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus #WIP #Find Windows alternative to $( ) -> From dc5a44bfc9c809f513d34895bca31f8669be9114 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 12:12:48 -0700 Subject: [PATCH 053/135] fix syntax --- .github/workflows/run-unit-tests.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 20d15ef2..908ab0b8 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -83,15 +83,12 @@ jobs: python setup.py install python setup.py download_jars - #Make windows/non-windows version - - name: Put words to sample stream - steps: - - name: is_windows_os - if: matrix.os == 'windows-latest' - run: python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: is_not_windows_os - if: matrix.os != 'windows-latest' - run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + - name: Put words to sample stream (windows) + if: matrix.os == 'windows-latest' + run: python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + - name: Put words to sample stream (non-windows) + if: matrix.os != 'windows-latest' + run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus #WIP #Find Windows alternative to $( ) -> From 4998dfbe8e3e383bde5e57b7bb469060f60557c0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 12:15:40 -0700 Subject: [PATCH 054/135] added ./ --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 908ab0b8..9b8a7b34 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,7 +85,7 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' - run: python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + run: python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From ddb5fdc9aedbd0fece12cb5603edcd6dd5289279 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 15:36:52 -0700 Subject: [PATCH 055/135] add cd command to check directory --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9b8a7b34..08c09e04 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,7 +85,9 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' - run: python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + run: | + cd + python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From bf66282de8e602c431f6830fde887f74d0349b75 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 15:42:03 -0700 Subject: [PATCH 056/135] edited cd command --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 08c09e04..2a3d23b0 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -86,7 +86,7 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | - cd + echo %cd% python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From fa0ec17bc9360f6ff2e3de3452d56cb2f937a1c2 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 15:48:48 -0700 Subject: [PATCH 057/135] echo cd --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 2a3d23b0..ce12cbe0 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -86,7 +86,7 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | - echo %cd% + echo cd python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From 1494e5ab144f52fc548537b85e0ba6880b893461 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 16:31:32 -0700 Subject: [PATCH 058/135] add checkout to windows putter --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ce12cbe0..174595e5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,8 +85,8 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' + uses: actions/checkout@v4 run: | - echo cd python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From ea0c528dc6eb28b5c4e020a5f7225c5abdfbe304 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 16:34:44 -0700 Subject: [PATCH 059/135] cd to home directory --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 174595e5..61c57755 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,8 +85,8 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' - uses: actions/checkout@v4 run: | + cd ~ python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From 9c6bf279b0a0c8c4e5dcee5d45db2abf5bb985ab Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 16:56:02 -0700 Subject: [PATCH 060/135] specify rootdir --- .github/workflows/run-unit-tests.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 61c57755..b471bc24 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -73,9 +73,12 @@ jobs: pip install -r requirements.txt pip install -r test_requirements.txt - - name: Test with pytest - run: | - pytest + - name: Test with pytest (windows) + if: matrix.os == 'windows-latest' + run: pytest + - name: Test with pytest (non-windows) + if: matrix.os != 'windows-latest' + run: pytest --rootdir=~/ - name: Install jar files # rerun python setup.py install at the end if jars download incorrectly From bf384c614ac83b56ddda0564dbb58d10c2215e7a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 16:57:34 -0700 Subject: [PATCH 061/135] specify rootdir fix --- .github/workflows/run-unit-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index b471bc24..446aa0d5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -73,11 +73,11 @@ jobs: pip install -r requirements.txt pip install -r test_requirements.txt - - name: Test with pytest (windows) - if: matrix.os == 'windows-latest' - run: pytest - name: Test with pytest (non-windows) if: matrix.os != 'windows-latest' + run: pytest + - name: Test with pytest (windows) + if: matrix.os == 'windows-latest' run: pytest --rootdir=~/ - name: Install jar files From 94e4127f5e35ebdd4a1bba6588398997f23da586 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 17:03:25 -0700 Subject: [PATCH 062/135] revert to working state; add extra install step --- .github/workflows/run-unit-tests.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 446aa0d5..1a118ac4 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -73,18 +73,15 @@ jobs: pip install -r requirements.txt pip install -r test_requirements.txt - - name: Test with pytest (non-windows) - if: matrix.os != 'windows-latest' + - name: Test with pytest run: pytest - - name: Test with pytest (windows) - if: matrix.os == 'windows-latest' - run: pytest --rootdir=~/ - name: Install jar files # rerun python setup.py install at the end if jars download incorrectly run: | python setup.py install python setup.py download_jars + python setup.py install - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' From 73a52be7b2748f33bc21b57bd8dbafbf657c8502 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 11 Apr 2025 17:06:40 -0700 Subject: [PATCH 063/135] no cd ~ --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 1a118ac4..c792f310 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -86,7 +86,6 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | - cd ~ python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From 029ddb80a0c0aa4c9f515bc0e62fefac637f8db1 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 09:37:09 -0700 Subject: [PATCH 064/135] cd to github.workspace --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index c792f310..b476efe2 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -34,6 +34,7 @@ jobs: # - name: Test with pytest # run: | # pytest + running_sample: # needs: [build] runs-on: ${{ matrix.os }} @@ -77,7 +78,6 @@ jobs: run: pytest - name: Install jar files - # rerun python setup.py install at the end if jars download incorrectly run: | python setup.py install python setup.py download_jars @@ -86,6 +86,7 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | + cd ${{ github.workspace }} python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From f30119c9de9dc4728bf1884322830b7584b94566 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 09:58:54 -0700 Subject: [PATCH 065/135] change pytest command --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index b476efe2..1053a7e2 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -75,7 +75,7 @@ jobs: pip install -r test_requirements.txt - name: Test with pytest - run: pytest + run: python -m pytest - name: Install jar files run: | From 8b8d3acc91c034df0f1bdea33372b56e40fb96cf Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 10:27:52 -0700 Subject: [PATCH 066/135] add -m flag to sampleputter windows --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 1053a7e2..494f8ef7 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -87,7 +87,7 @@ jobs: if: matrix.os == 'windows-latest' run: | cd ${{ github.workspace }} - python ./sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + python -m sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From 8452714f797bc143835793a980eb71895b0e11ca Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 10:34:30 -0700 Subject: [PATCH 067/135] remove .py --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 494f8ef7..55c7b5b3 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -87,7 +87,7 @@ jobs: if: matrix.os == 'windows-latest' run: | cd ${{ github.workspace }} - python -m sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + python -m sample_kinesis_wordputter --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From 6bc58d6b523c60d3031039ed19cf2987ce1e7d6d Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 10:43:42 -0700 Subject: [PATCH 068/135] update python setup.py install command --- .github/workflows/run-unit-tests.yml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 55c7b5b3..fda763d9 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -77,17 +77,23 @@ jobs: - name: Test with pytest run: python -m pytest +# - name: Install jar files +# run: | +# python setup.py install +# python setup.py download_jars +# python setup.py install + - name: Install jar files run: | - python setup.py install + python -m pip install . python setup.py download_jars - python setup.py install +# python -m pip install . - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | cd ${{ github.workspace }} - python -m sample_kinesis_wordputter --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus From bfeedc16c83f6581c78fd75ac41ec9df376b5f7a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 10:47:16 -0700 Subject: [PATCH 069/135] update python setup.py install command --- .github/workflows/run-unit-tests.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index fda763d9..bd132840 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -77,26 +77,20 @@ jobs: - name: Test with pytest run: python -m pytest -# - name: Install jar files -# run: | -# python setup.py install -# python setup.py download_jars -# python setup.py install - - name: Install jar files run: | python -m pip install . python setup.py download_jars -# python -m pip install . + python -m pip install . - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' run: | - cd ${{ github.workspace }} python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' - run: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + run: | + sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus #WIP #Find Windows alternative to $( ) -> From b4fc93bb93ed1cb7b7b5ec3b668299cc04374955 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 10:57:23 -0700 Subject: [PATCH 070/135] add working directory arg and cd command windows --- .github/workflows/run-unit-tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index bd132840..0abf3ba4 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,7 +85,9 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' + working-directory: ./samples run: | + cd python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From b635917a13e86b2b9d87816d5c1bcd3ddcf5e4f0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:11:03 -0700 Subject: [PATCH 071/135] mess w jar command --- .github/workflows/run-unit-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 0abf3ba4..40ee6bb6 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -80,14 +80,15 @@ jobs: - name: Install jar files run: | python -m pip install . - python setup.py download_jars +# python setup.py download_jars + python -m pip download_jars . python -m pip install . - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' working-directory: ./samples run: | - cd + echo cd python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' From 22d01512ea185b5ec01c4db0cc25b1b75160e7ba Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:12:06 -0700 Subject: [PATCH 072/135] mess w jar command 2 --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 40ee6bb6..8e138ec9 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -81,8 +81,8 @@ jobs: run: | python -m pip install . # python setup.py download_jars - python -m pip download_jars . - python -m pip install . + python setup.py download_jars + python setup.py install - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' From bd3224ea7de55f5165ac36a15eade43f7dcb57ac Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:12:53 -0700 Subject: [PATCH 073/135] mess w jar command 3 --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 8e138ec9..24689d1d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -80,7 +80,6 @@ jobs: - name: Install jar files run: | python -m pip install . -# python setup.py download_jars python setup.py download_jars python setup.py install From 185d67b7acaa38aaf5ac690c1c135c9164efb700 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:22:58 -0700 Subject: [PATCH 074/135] command subsitiution windows --- .github/workflows/run-unit-tests.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 24689d1d..00b37901 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -83,12 +83,14 @@ jobs: python setup.py download_jars python setup.py install + #working as intended - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' working-directory: ./samples run: | - echo cd python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + + #working as intended - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: | @@ -101,7 +103,7 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' # run: echo 'Windows version' - run: $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: %amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties% # continue-on-error: true #working as intended From 1052b50122cfa65e7bcc787fce1c620d704b204d Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:29:05 -0700 Subject: [PATCH 075/135] print helper command --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 00b37901..d52c1440 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -103,7 +103,7 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' # run: echo 'Windows version' - run: %amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties% + run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties # continue-on-error: true #working as intended From 0bcb73f9138c2ded8ddde45b402528c8c813abfb Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:32:04 -0700 Subject: [PATCH 076/135] add python option to windows command --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index d52c1440..6297223b 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -103,7 +103,7 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' # run: echo 'Windows version' - run: amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + run: python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties # continue-on-error: true #working as intended From 26c58da455178dfbd0e07fe87a0f0fad74a43324 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:42:58 -0700 Subject: [PATCH 077/135] add working-directory to helper.py command windows --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6297223b..cd21d845 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,6 +102,7 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' + working-directory: ./samples # run: echo 'Windows version' run: python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties # continue-on-error: true From 2238ce73970d9136b4a3fe2b0d1586a6d0471ec3 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:50:05 -0700 Subject: [PATCH 078/135] add command sub windows kcl command --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index cd21d845..31dfdf4c 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -104,7 +104,7 @@ jobs: if: matrix.os == 'windows-latest' working-directory: ./samples # run: echo 'Windows version' - run: python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + run: (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true #working as intended From 180a8b0cf7f7520fa95dc6ceba39d3295eade4d2 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 11:58:16 -0700 Subject: [PATCH 079/135] change kcl windows to be pwsh shell and add cmd substitution --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 31dfdf4c..61b19a0f 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,9 +102,10 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' + shell: pwsh working-directory: ./samples # run: echo 'Windows version' - run: (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: $(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true #working as intended From f1742a2ce6a9267b084e2c0f36605c54c063644c Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 12:02:37 -0700 Subject: [PATCH 080/135] change shell to bash for windows kcl --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 61b19a0f..4fdc83c5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,10 +102,10 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - shell: pwsh + shell: bash working-directory: ./samples # run: echo 'Windows version' - run: $(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: `python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties` # continue-on-error: true #working as intended From 2a03d7c90bf58fbd445128ab068be54b42923bf3 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 12:15:51 -0700 Subject: [PATCH 081/135] add extra parenthesis for cmd subsitution --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 4fdc83c5..3f505754 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -105,7 +105,7 @@ jobs: shell: bash working-directory: ./samples # run: echo 'Windows version' - run: `python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties` + run: $($(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties)) # continue-on-error: true #working as intended From 0ef7574176d103c985521641610f6b02cf62359f Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 13:22:45 -0700 Subject: [PATCH 082/135] change kcl windows shell to cmd --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3f505754..8e2c1707 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,10 +102,10 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - shell: bash + shell: cmd working-directory: ./samples # run: echo 'Windows version' - run: $($(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties)) + run: %python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties% # continue-on-error: true #working as intended From 4b12d704297968570952a75ba21aaaca218f34dd Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 13:25:48 -0700 Subject: [PATCH 083/135] should work --- .github/workflows/run-unit-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 8e2c1707..ecfd34c4 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,10 +102,10 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - shell: cmd + shell: bash working-directory: ./samples # run: echo 'Windows version' - run: %python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties% + run: $(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) # continue-on-error: true #working as intended From 9c9bc33ba151896b6abe3a5c976212166209e295 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 13:40:54 -0700 Subject: [PATCH 084/135] trying new cmdsub --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ecfd34c4..9f600a39 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -105,7 +105,9 @@ jobs: shell: bash working-directory: ./samples # run: echo 'Windows version' - run: $(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) + run: | + my_cmd='(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties)' + my_cmd # continue-on-error: true #working as intended From bf0b0074a7c27c38c1b3d5dca27a5e3ea5122082 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 13:43:32 -0700 Subject: [PATCH 085/135] trying new cmdsub 2 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9f600a39..c181447a 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -107,7 +107,7 @@ jobs: # run: echo 'Windows version' run: | my_cmd='(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties)' - my_cmd + (my_cmd) # continue-on-error: true #working as intended From 4504776fecfb1972a0bd9cc34e6dbc0957c97887 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 13:47:46 -0700 Subject: [PATCH 086/135] trying new cmdsub 3 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index c181447a..f7653b11 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -106,7 +106,7 @@ jobs: working-directory: ./samples # run: echo 'Windows version' run: | - my_cmd='(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties)' + my_cmd=(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) (my_cmd) # continue-on-error: true From 6c97f6a1fb4e9269b820691ea09abfbe19e351a7 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 16:48:03 -0700 Subject: [PATCH 087/135] trying new cmdsub 4 --- .github/workflows/run-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f7653b11..7c919d80 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -106,8 +106,7 @@ jobs: working-directory: ./samples # run: echo 'Windows version' run: | - my_cmd=(python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) - (my_cmd) + for /f "usebackq tokens=*" %a in (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) do %a # continue-on-error: true #working as intended From a9eec089a3465beeb46e370aaeaf3467f7df93f1 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 16:50:39 -0700 Subject: [PATCH 088/135] trying new cmdsub 5 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 7c919d80..19004783 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -106,7 +106,7 @@ jobs: working-directory: ./samples # run: echo 'Windows version' run: | - for /f "usebackq tokens=*" %a in (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) do %a + for /f "usebackq tokens=*" %%a in (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) do %%a # continue-on-error: true #working as intended From 1ea623db1bb25dd924021a0176f92604d1fbc9a7 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 16:52:26 -0700 Subject: [PATCH 089/135] trying new cmdsub 5 --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 19004783..ca02b8eb 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,7 +102,6 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - shell: bash working-directory: ./samples # run: echo 'Windows version' run: | From faca4f7581b60e719790e3c4a651131debacbc7a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 16:52:47 -0700 Subject: [PATCH 090/135] trying new cmdsub 6 --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ca02b8eb..3a628a3c 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -103,7 +103,6 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' working-directory: ./samples - # run: echo 'Windows version' run: | for /f "usebackq tokens=*" %%a in (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) do %%a # continue-on-error: true From 7d99bf4b79a4c68196de2d5faac6ab48b7351aeb Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 16:59:45 -0700 Subject: [PATCH 091/135] trying new cmdsub 7 --- .github/workflows/run-unit-tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3a628a3c..f8a3eeef 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -102,9 +102,11 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' + shell: bash working-directory: ./samples + # run: echo 'Windows version' run: | - for /f "usebackq tokens=*" %%a in (python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) do %%a + for /f "usebackq tokens=*" %a in (`python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties`) do %a # continue-on-error: true #working as intended From 23d9adb392da706c9120d4acb06393a7c64654b1 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Mon, 14 Apr 2025 17:07:52 -0700 Subject: [PATCH 092/135] trying new cmdsub 8 --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f8a3eeef..a059c047 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -106,7 +106,7 @@ jobs: working-directory: ./samples # run: echo 'Windows version' run: | - for /f "usebackq tokens=*" %a in (`python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties`) do %a + for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a # continue-on-error: true #working as intended From b538c250f5b7cc44074cf3f28f4be42008e76194 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 09:31:23 -0700 Subject: [PATCH 093/135] changing windows shell to bash --- .github/workflows/run-unit-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index a059c047..cefd80de 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -104,9 +104,10 @@ jobs: if: matrix.os == 'windows-latest' shell: bash working-directory: ./samples - # run: echo 'Windows version' run: | - for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a + echo $PATH +# timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi +# for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a # continue-on-error: true #working as intended From 03d2ac6c262a02fa72a41619c100ba57420069f6 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:04:35 -0700 Subject: [PATCH 094/135] windows bash helper.py cmd test --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index cefd80de..9e66ec53 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -107,6 +107,7 @@ jobs: run: | echo $PATH # timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties # for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a # continue-on-error: true From fb434606bec0f941ba0318a0a99c1814977899d7 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:05:20 -0700 Subject: [PATCH 095/135] windows bash helper.py cmd test whitespace --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9e66ec53..12d7782e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -107,7 +107,7 @@ jobs: run: | echo $PATH # timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties # for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a # continue-on-error: true From 9030646eac3b459b21e4b1df39ff0b261c33c967 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:08:58 -0700 Subject: [PATCH 096/135] remove some commented lines --- .github/workflows/run-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 12d7782e..53a5cb33 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -98,6 +98,7 @@ jobs: #WIP #Find Windows alternative to $( ) -> + #timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi #Find Windows alternative to timeout command (if necessary) - name: Start KCL application windows timeout-minutes: 2 @@ -106,9 +107,7 @@ jobs: working-directory: ./samples run: | echo $PATH -# timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties -# for /f "usebackq tokens=*" %a in ('python amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties') do %a # continue-on-error: true #working as intended From 47ce250e1da7d29b28ef1845665b429eee0f4f79 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:11:54 -0700 Subject: [PATCH 097/135] run kcl command through bash with windows version --- .github/workflows/run-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 53a5cb33..0b25d7b5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -98,7 +98,6 @@ jobs: #WIP #Find Windows alternative to $( ) -> - #timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi #Find Windows alternative to timeout command (if necessary) - name: Start KCL application windows timeout-minutes: 2 @@ -107,7 +106,7 @@ jobs: working-directory: ./samples run: | echo $PATH - amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties + timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi # continue-on-error: true #working as intended From a0e469380a369e9b8b8c2f2628625d8c8976c573 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:17:01 -0700 Subject: [PATCH 098/135] remove working directory specifier in windows --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 0b25d7b5..0f62958a 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -103,7 +103,7 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' shell: bash - working-directory: ./samples + # working-directory: ./samples run: | echo $PATH timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From fc2fe02345add56ade7d79c331884e5f5c1cd192 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:30:53 -0700 Subject: [PATCH 099/135] change default shell to bash --- .github/workflows/run-unit-tests.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 0f62958a..bc6ca444 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -38,7 +38,9 @@ jobs: running_sample: # needs: [build] runs-on: ${{ matrix.os }} - # timeout-minutes: 5 + defaults: + run: + shell: bash strategy: fail-fast: false matrix: @@ -102,7 +104,6 @@ jobs: - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - shell: bash # working-directory: ./samples run: | echo $PATH From 9bec949336ec697cbd9f1c2ade87049eca9ad442 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:46:25 -0700 Subject: [PATCH 100/135] change .join to from : to ; for windows testing --- samples/amazon_kclpy_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/amazon_kclpy_helper.py b/samples/amazon_kclpy_helper.py index 9596c052..6647733f 100644 --- a/samples/amazon_kclpy_helper.py +++ b/samples/amazon_kclpy_helper.py @@ -54,7 +54,7 @@ def get_kcl_jar_path(): :rtype: str :return: The absolute path of the KCL jar files needed to run the MultiLangDaemon. ''' - return ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar'))) + return ';'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar'))) def get_kcl_classpath(properties=None, paths=[]): ''' From 476acda1cbba7c18b5c21392749543d73a894477 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:50:20 -0700 Subject: [PATCH 101/135] change sample.properties executableName --- samples/sample.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/sample.properties b/samples/sample.properties index 75fc71ff..9a796769 100644 --- a/samples/sample.properties +++ b/samples/sample.properties @@ -1,7 +1,7 @@ # The script that abides by the multi-language protocol. This script will # be executed by the MultiLangDaemon, which will communicate with this script # over STDIN and STDOUT according to the multi-language protocol. -executableName = sample_kclpy_app.py +executableName = python sample_kclpy_app.py # The Stream arn: arn:aws:kinesis:::stream/ # Important: streamArn takes precedence over streamName if both are set From c23af552f85d905e05ffb38f4514d510a4bee84d Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:51:19 -0700 Subject: [PATCH 102/135] changed second : to ; for windows testing --- samples/amazon_kclpy_helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/amazon_kclpy_helper.py b/samples/amazon_kclpy_helper.py index 6647733f..9cb0fb9c 100644 --- a/samples/amazon_kclpy_helper.py +++ b/samples/amazon_kclpy_helper.py @@ -81,7 +81,7 @@ def get_kcl_classpath(properties=None, paths=[]): # Add the dir that the props file is in dir_of_file = get_dir_of_file(properties) paths.append(dir_of_file) - return ":".join([p for p in paths if p != '']) + return ";".join([p for p in paths if p != '']) def get_kcl_app_command(args, multi_lang_daemon_class, properties, log_configuration, paths=[]): ''' From e746d5842923ea3a34edfb7894ad4d20af6a38ef Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 10:55:38 -0700 Subject: [PATCH 103/135] remove changes to sample.properties --- samples/sample.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/sample.properties b/samples/sample.properties index 9a796769..75fc71ff 100644 --- a/samples/sample.properties +++ b/samples/sample.properties @@ -1,7 +1,7 @@ # The script that abides by the multi-language protocol. This script will # be executed by the MultiLangDaemon, which will communicate with this script # over STDIN and STDOUT according to the multi-language protocol. -executableName = python sample_kclpy_app.py +executableName = sample_kclpy_app.py # The Stream arn: arn:aws:kinesis:::stream/ # Important: streamArn takes precedence over streamName if both are set From 0517a0a54353ef8bfe164ca362d06b09c0fd8d86 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:17:50 -0700 Subject: [PATCH 104/135] amazon_kclpy_helper os dependent command generation --- samples/amazon_kclpy_helper.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/samples/amazon_kclpy_helper.py b/samples/amazon_kclpy_helper.py index 9cb0fb9c..36fd9fa5 100644 --- a/samples/amazon_kclpy_helper.py +++ b/samples/amazon_kclpy_helper.py @@ -54,7 +54,10 @@ def get_kcl_jar_path(): :rtype: str :return: The absolute path of the KCL jar files needed to run the MultiLangDaemon. ''' - return ';'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar'))) + if os.name == 'posix': + return ':'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar'))) + else: + return ';'.join(glob(os.path.join(get_kcl_dir(), 'jars', '*jar'))) def get_kcl_classpath(properties=None, paths=[]): ''' @@ -81,7 +84,10 @@ def get_kcl_classpath(properties=None, paths=[]): # Add the dir that the props file is in dir_of_file = get_dir_of_file(properties) paths.append(dir_of_file) - return ";".join([p for p in paths if p != '']) + if os.name == 'posix': + return ":".join([p for p in paths if p != '']) + else: + return ";".join([p for p in paths if p != '']) def get_kcl_app_command(args, multi_lang_daemon_class, properties, log_configuration, paths=[]): ''' From be4d749ab6d288edcbce207d118d5718b1aab761 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:22:44 -0700 Subject: [PATCH 105/135] addition of pyproject.toml --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 00000000..7fd26b97 --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools"] +build-backend = "setuptools.build_meta" \ No newline at end of file From 82c209dd931672fb728c83896346c99010949207 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:30:59 -0700 Subject: [PATCH 106/135] addition of pyproject.toml requires section --- pyproject.toml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 7fd26b97..922e712e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,8 @@ [build-system] -requires = ["setuptools"] +requires = [ + "setuptools", + "__future__", + "amazon_kclpy", + "glob" +] build-backend = "setuptools.build_meta" \ No newline at end of file From fea32b92e1fdaec45c7444e348616b66717afa66 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:32:44 -0700 Subject: [PATCH 107/135] removed future from requires --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 922e712e..e361f9ec 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,6 @@ [build-system] requires = [ "setuptools", - "__future__", "amazon_kclpy", "glob" ] From eaaf821bc0350b01fd1d3f235951139cae720ba0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:34:12 -0700 Subject: [PATCH 108/135] remove glob from requires --- pyproject.toml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index e361f9ec..03769060 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,7 +1,6 @@ [build-system] requires = [ "setuptools", - "amazon_kclpy", - "glob" + "amazon_kclpy" ] build-backend = "setuptools.build_meta" \ No newline at end of file From 9645a15ef21f8f5969c6bcfb4c8b657112fa7575 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:37:32 -0700 Subject: [PATCH 109/135] remove pyproject.toml --- pyproject.toml | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml deleted file mode 100644 index 03769060..00000000 --- a/pyproject.toml +++ /dev/null @@ -1,6 +0,0 @@ -[build-system] -requires = [ - "setuptools", - "amazon_kclpy" -] -build-backend = "setuptools.build_meta" \ No newline at end of file From a8e81acb4be3dcd89909675bcb4e59ed7ca93d5b Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:45:44 -0700 Subject: [PATCH 110/135] add python build command --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index bc6ca444..d2119b81 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -82,6 +82,7 @@ jobs: - name: Install jar files run: | python -m pip install . + python -m build python setup.py download_jars python setup.py install From 63b4c56a0a3f7abdd78744a5c434e5457d16172a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:48:11 -0700 Subject: [PATCH 111/135] add pip install build --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index d2119b81..1584a1da 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -75,6 +75,7 @@ jobs: python -m pip install --upgrade pip pip install -r requirements.txt pip install -r test_requirements.txt + pip install build - name: Test with pytest run: python -m pytest @@ -84,7 +85,6 @@ jobs: python -m pip install . python -m build python setup.py download_jars - python setup.py install #working as intended - name: Put words to sample stream (windows) From 3b5c0efbf408394702914563dd0401aad31d2c6e Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 11:57:42 -0700 Subject: [PATCH 112/135] re add setup.py install --- .github/workflows/run-unit-tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 1584a1da..8138f5c0 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -85,6 +85,7 @@ jobs: python -m pip install . python -m build python setup.py download_jars + python setup.py install #working as intended - name: Put words to sample stream (windows) From 37a2946dd57ec9ae88ead7a1f2a997bbe5c4f64c Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 14:03:53 -0700 Subject: [PATCH 113/135] trying jar installations 1 --- .github/workflows/run-unit-tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 8138f5c0..ed41eb08 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -82,7 +82,6 @@ jobs: - name: Install jar files run: | - python -m pip install . python -m build python setup.py download_jars python setup.py install From 70f3087b318cd2b2c5e930cee223d7066c1475a2 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 14:38:50 -0700 Subject: [PATCH 114/135] whitespace and comment removal --- .github/workflows/run-unit-tests.yml | 42 ++++------------------------ 1 file changed, 5 insertions(+), 37 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index ed41eb08..6434b05e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -13,41 +13,18 @@ permissions: contents: read jobs: -# build: -# runs-on: ${{ matrix.os }} -# strategy: -# fail-fast: false -# matrix: -# python-version: [3.8, 3.9, "3.10", 3.11] -# os: [ubuntu-latest, macOS-latest, windows-latest ] -# steps: -# - uses: actions/checkout@v2 -# - name: Set up Python ${{ matrix.python-version }} -# uses: actions/setup-python@v2 -# with: -# python-version: ${{ matrix.python-version }} -# - name: Install dependencies -# run: | -# python -m pip install --upgrade pip -# pip install -r requirements.txt -# pip install -r test_requirements.txt -# - name: Test with pytest -# run: | -# pytest - running_sample: - # needs: [build] runs-on: ${{ matrix.os }} defaults: run: shell: bash + strategy: fail-fast: false matrix: -# python-version: [ 3.8, 3.9, "3.10", 3.11 ] -# os: [ ubuntu-latest, macOS-latest, windows-latest ] - python-version: [ "3.10", 3.11 ] + python-version: [ 3.8, 3.9, "3.10", 3.11 ] os: [ ubuntu-latest, macOS-latest, windows-latest ] + steps: - name: Checkout uses: actions/checkout@v4 @@ -86,37 +63,28 @@ jobs: python setup.py download_jars python setup.py install - #working as intended - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' working-directory: ./samples run: | python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - #working as intended - name: Put words to sample stream (non-windows) if: matrix.os != 'windows-latest' run: | sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - #WIP - #Find Windows alternative to $( ) -> - #Find Windows alternative to timeout command (if necessary) - name: Start KCL application windows timeout-minutes: 2 if: matrix.os == 'windows-latest' - # working-directory: ./samples run: | - echo $PATH timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - # continue-on-error: true - #working as intended - name: Start KCL application ubuntu if: matrix.os == 'ubuntu-latest' - run: timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + run: | + timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - #working as intended - name: Start KCL application macOS if: matrix.os == 'macOS-latest' run: | From 9a20e3338dce8029773f31169bb9107035ba3964 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 14:56:44 -0700 Subject: [PATCH 115/135] increase timeout to 45s --- .github/workflows/run-unit-tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 6434b05e..c52d7d96 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -55,7 +55,8 @@ jobs: pip install build - name: Test with pytest - run: python -m pytest + run: | + python -m pytest - name: Install jar files run: | @@ -78,15 +79,15 @@ jobs: timeout-minutes: 2 if: matrix.os == 'windows-latest' run: | - timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - name: Start KCL application ubuntu if: matrix.os == 'ubuntu-latest' run: | - timeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - name: Start KCL application macOS if: matrix.os == 'macOS-latest' run: | brew install coreutils - gtimeout 30 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From 368f95f9ff9a846ed78e11e45fecb17e3dc098d4 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Tue, 15 Apr 2025 15:43:50 -0700 Subject: [PATCH 116/135] remove java setup --- .github/workflows/run-unit-tests.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index c52d7d96..1dd95a12 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -41,11 +41,11 @@ jobs: with: python-version: ${{ matrix.python-version }} - - name: Set up JDK 8 - uses: actions/setup-java@v4 - with: - java-version: '8' - distribution: 'corretto' +# - name: Set up JDK 8 +# uses: actions/setup-java@v4 +# with: +# java-version: '8' +# distribution: 'corretto' - name: Install Python and required pips run: | From 6d8145b2c37c83aacb09996a08f72dd890c67887 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:18:08 -0700 Subject: [PATCH 117/135] edited names --- .github/workflows/run-unit-tests.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 1dd95a12..11b4b03c 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -41,12 +41,6 @@ jobs: with: python-version: ${{ matrix.python-version }} -# - name: Set up JDK 8 -# uses: actions/setup-java@v4 -# with: -# java-version: '8' -# distribution: 'corretto' - - name: Install Python and required pips run: | python -m pip install --upgrade pip @@ -54,11 +48,11 @@ jobs: pip install -r test_requirements.txt pip install build - - name: Test with pytest + - name: Test with Pytest run: | python -m pytest - - name: Install jar files + - name: Install .jar files run: | python -m build python setup.py download_jars @@ -70,23 +64,22 @@ jobs: run: | python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: Put words to sample stream (non-windows) + - name: Put words to sample stream (ubuntu and macOS) if: matrix.os != 'windows-latest' run: | sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: Start KCL application windows - timeout-minutes: 2 + - name: Start KCL application (windows) if: matrix.os == 'windows-latest' run: | timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - - name: Start KCL application ubuntu + - name: Start KCL application (ubuntu) if: matrix.os == 'ubuntu-latest' run: | timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - - name: Start KCL application macOS + - name: Start KCL application (macOS) if: matrix.os == 'macOS-latest' run: | brew install coreutils From 5f9e8392926f49a6a68d92777e192ef854a486e0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:19:03 -0700 Subject: [PATCH 118/135] optimize sample stream for windows --- .github/workflows/run-unit-tests.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 11b4b03c..29ca528b 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -60,9 +60,8 @@ jobs: - name: Put words to sample stream (windows) if: matrix.os == 'windows-latest' - working-directory: ./samples run: | - python sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus + sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Put words to sample stream (ubuntu and macOS) if: matrix.os != 'windows-latest' From 71f8459687acbf0b44bca45c897cb84dee51dc5d Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:25:10 -0700 Subject: [PATCH 119/135] macOS KCL app optimization --- .github/workflows/run-unit-tests.yml | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 29ca528b..f980fc5a 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -58,13 +58,7 @@ jobs: python setup.py download_jars python setup.py install - - name: Put words to sample stream (windows) - if: matrix.os == 'windows-latest' - run: | - sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - - name: Put words to sample stream (ubuntu and macOS) - if: matrix.os != 'windows-latest' + - name: Put words to sample stream run: | sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus @@ -81,5 +75,4 @@ jobs: - name: Start KCL application (macOS) if: matrix.os == 'macOS-latest' run: | - brew install coreutils - gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From 9e5011a567cbe6832c3e74124282695fed57ed56 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:29:26 -0700 Subject: [PATCH 120/135] kcl app optimization --- .github/workflows/run-unit-tests.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f980fc5a..3a5a6d0e 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -62,17 +62,13 @@ jobs: run: | sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - - name: Start KCL application (windows) - if: matrix.os == 'windows-latest' - run: | - timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - - - name: Start KCL application (ubuntu) - if: matrix.os == 'ubuntu-latest' + - name: Start KCL application (windows or ubuntu) + if: matrix.os == 'windows-latest' || 'ubuntu-latest' run: | timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - name: Start KCL application (macOS) if: matrix.os == 'macOS-latest' run: | - timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi + brew install coreutils + gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From 86ac02ddc54ca3f7fdcc0d1cbe886ba89de1d8d8 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:33:37 -0700 Subject: [PATCH 121/135] finalizing optimizations --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 3a5a6d0e..0c55dc23 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -14,6 +14,7 @@ permissions: jobs: running_sample: + timeout-minutes: 8 runs-on: ${{ matrix.os }} defaults: run: @@ -63,7 +64,7 @@ jobs: sample_kinesis_wordputter.py --stream kclpysample -w cat -w dog -w bird -w lobster -w octopus - name: Start KCL application (windows or ubuntu) - if: matrix.os == 'windows-latest' || 'ubuntu-latest' + if: matrix.os != 'macOS-latest' run: | timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From 0a57834377784235b02f2467fa4242ec71c7f475 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:44:22 -0700 Subject: [PATCH 122/135] failure testing: logback 1.3.15 -> 1.5.16 --- .github/workflows/run-unit-tests.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 0c55dc23..cde8667c 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -13,7 +13,7 @@ permissions: contents: read jobs: - running_sample: + build-running_sample: timeout-minutes: 8 runs-on: ${{ matrix.os }} defaults: diff --git a/pom.xml b/pom.xml index b41b8330..71731a48 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.1.118.Final 2.0.6 2.13.5 - 1.3.15 + 1.5.16 From e49ac9f7de17c5ccf44af18b21211b09ddfe53c0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:55:48 -0700 Subject: [PATCH 123/135] re-add java installation --- .github/workflows/run-unit-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index cde8667c..afba4cf7 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -37,6 +37,12 @@ jobs: role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_GHWF }} role-session-name: myGitHubActions + - name: Set up JDK 8 + uses: actions/setup-java@v4 + with: + java-version: '8' + distribution: 'corretto' + - name: Set up Python ${{ matrix.python-version }} uses: actions/setup-python@v2 with: From f10620071f0299c56ebdc4153e6020523ac3099a Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 09:58:25 -0700 Subject: [PATCH 124/135] add where-java testing for java installation --- .github/workflows/run-unit-tests.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index afba4cf7..f130e7aa 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -72,10 +72,16 @@ jobs: - name: Start KCL application (windows or ubuntu) if: matrix.os != 'macOS-latest' run: | + echo $(which java) + echo $(whereis java) + echo $(java -version) timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - name: Start KCL application (macOS) if: matrix.os == 'macOS-latest' run: | + echo $(which java) + echo $(whereis java) + echo $(java -version) brew install coreutils gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi From be8271595a9ce4d41b194659571fa973430d49f0 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 10:05:19 -0700 Subject: [PATCH 125/135] success testing: pom.xml fixed --- .github/workflows/run-unit-tests.yml | 6 ------ pom.xml | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index f130e7aa..afba4cf7 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -72,16 +72,10 @@ jobs: - name: Start KCL application (windows or ubuntu) if: matrix.os != 'macOS-latest' run: | - echo $(which java) - echo $(whereis java) - echo $(java -version) timeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi - name: Start KCL application (macOS) if: matrix.os == 'macOS-latest' run: | - echo $(which java) - echo $(whereis java) - echo $(java -version) brew install coreutils gtimeout 45 $(amazon_kclpy_helper.py --print_command --java $(which java) --properties samples/sample.properties) || code=$?; if [[ $code -ne 124 && $code -ne 0 ]]; then exit $code; fi diff --git a/pom.xml b/pom.xml index 71731a48..b41b8330 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.1.118.Final 2.0.6 2.13.5 - 1.5.16 + 1.3.15 From 27046edbd3174eacb819b64d948a41cc38aba55c Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 10:18:28 -0700 Subject: [PATCH 126/135] sample-kcl build tests --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index afba4cf7..4ac009b9 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master, java-build-tests ] + branches: [ master ] pull_request: branches: [ master ] From d4d1c864cdbb2d4e828aec7dd9388665dfe3050b Mon Sep 17 00:00:00 2001 From: skye rogers Date: Wed, 16 Apr 2025 10:53:05 -0700 Subject: [PATCH 127/135] update OIDC secret names --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 4ac009b9..bdff7444 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -34,7 +34,7 @@ jobs: uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID }}:role/${{ secrets.AWS_ROLE_GHWF }} + role-to-assume: arn:aws:iam::${{ secrets.AWS_ACTIONS_ACCOUNT_ID }}:role/${{ secrets.AWS_ACTIONS_ROLE }} role-session-name: myGitHubActions - name: Set up JDK 8 From 17186cc52db08f894c6041cd6027b7f01b9fcfa4 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 09:11:51 -0700 Subject: [PATCH 128/135] initial commit --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index bdff7444..fc96da8d 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -14,7 +14,7 @@ permissions: jobs: build-running_sample: - timeout-minutes: 8 + timeout-minutes: 7 runs-on: ${{ matrix.os }} defaults: run: From 794ea0b48823b4f930cc293a906bc9014557af6e Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 09:13:15 -0700 Subject: [PATCH 129/135] add secrets-tests to on.push.branches --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index fc96da8d..17e80cf5 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master ] + branches: [ master, secrets-tests ] pull_request: branches: [ master ] From 7e668e48ad5576297af358abf03694610d46b8d1 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 09:44:34 -0700 Subject: [PATCH 130/135] change role-to-assume variable --- .github/workflows/run-unit-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 17e80cf5..4d796a27 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -34,7 +34,8 @@ jobs: uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-east-1 - role-to-assume: arn:aws:iam::${{ secrets.AWS_ACTIONS_ACCOUNT_ID }}:role/${{ secrets.AWS_ACTIONS_ROLE }} + #role-to-assume: arn:aws:iam::${{ secrets.AWS_ACTIONS_ACCOUNT_ID }}:role/${{ secrets.AWS_ACTIONS_ROLE }} + role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows role-session-name: myGitHubActions - name: Set up JDK 8 From c2db59ba8f1dc923f6faab70dcd7035c49765646 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 09:51:47 -0700 Subject: [PATCH 131/135] remove extra branches from on.push.branches --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 4d796a27..9ecc5c32 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master, secrets-tests ] + branches: [ master ] pull_request: branches: [ master ] From c46c5ecefc94968138b3bf87d0dc6dd18a9ba1f7 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 11:17:33 -0700 Subject: [PATCH 132/135] logback to 1.5.16 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b41b8330..71731a48 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.1.118.Final 2.0.6 2.13.5 - 1.3.15 + 1.5.16 From 6bb918a7c2f36f652b73d40f0a4bd1c5c74f57da Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 11:18:25 -0700 Subject: [PATCH 133/135] add secrets-test to on.push --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 9ecc5c32..af31fe85 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master ] + branches: [ master, secret-tests ] pull_request: branches: [ master ] From 5267b82d6096ac4c8e33d8d69d9e24a1d2d06e2b Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 11:18:41 -0700 Subject: [PATCH 134/135] add secrets-test to on.push. --- .github/workflows/run-unit-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index af31fe85..4d796a27 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,7 +4,7 @@ name: UnitTestCoverage on: push: - branches: [ master, secret-tests ] + branches: [ master, secrets-tests ] pull_request: branches: [ master ] From 66b605834ed8a0974ee0589af849094e023f4d69 Mon Sep 17 00:00:00 2001 From: skye rogers Date: Fri, 18 Apr 2025 12:07:08 -0700 Subject: [PATCH 135/135] merge ready --- .github/workflows/run-unit-tests.yml | 7 +++---- pom.xml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/run-unit-tests.yml b/.github/workflows/run-unit-tests.yml index 4d796a27..be6fb379 100644 --- a/.github/workflows/run-unit-tests.yml +++ b/.github/workflows/run-unit-tests.yml @@ -4,9 +4,9 @@ name: UnitTestCoverage on: push: - branches: [ master, secrets-tests ] + branches: [ master, v2.x ] pull_request: - branches: [ master ] + branches: [ master, v2.x ] permissions: id-token: write @@ -14,7 +14,7 @@ permissions: jobs: build-running_sample: - timeout-minutes: 7 + timeout-minutes: 8 runs-on: ${{ matrix.os }} defaults: run: @@ -34,7 +34,6 @@ jobs: uses: aws-actions/configure-aws-credentials@v4 with: aws-region: us-east-1 - #role-to-assume: arn:aws:iam::${{ secrets.AWS_ACTIONS_ACCOUNT_ID }}:role/${{ secrets.AWS_ACTIONS_ROLE }} role-to-assume: arn:aws:iam::751999266872:role/GitHubWorkflows role-session-name: myGitHubActions diff --git a/pom.xml b/pom.xml index 71731a48..b41b8330 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ 4.1.118.Final 2.0.6 2.13.5 - 1.5.16 + 1.3.15