From ecf0709b0cbd19c2d0f2e0bf16d9c2323bfb0793 Mon Sep 17 00:00:00 2001 From: Javy de Koning Date: Wed, 10 Aug 2022 19:36:42 +0200 Subject: [PATCH 1/5] Initial GitHub Actions workflow --- .github/workflows/adf.yml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .github/workflows/adf.yml diff --git a/.github/workflows/adf.yml b/.github/workflows/adf.yml new file mode 100644 index 000000000..9e11d30cc --- /dev/null +++ b/.github/workflows/adf.yml @@ -0,0 +1,28 @@ +name: ADF CI + +on: [push, pull_request] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + python-version: ["3.9", "3.10"] + + steps: + - name: Checkout Repo + uses: actions/checkout@v3 + - name: Set up Python ${{ matrix.python-version }} + uses: actions/setup-python@v4 + with: + python-version: ${{ matrix.python-version }} + - name: Set the correct Node version using nvm + shell: bash -l {0} + run: nvm install + - name: Install dependencies + run: make init + - name: Run tox + # Run tox using the version of Python in `PATH` + run: | + tox --version + tox #-e py \ No newline at end of file From 440ea7976a3e0b47e00e959df26d2b940ff45bea Mon Sep 17 00:00:00 2001 From: Javy de Koning Date: Wed, 10 Aug 2022 19:46:47 +0200 Subject: [PATCH 2/5] Fix GH Actions --- .github/workflows/adf.yml | 2 +- .../bootstrap_repository/adf-build/requirements.txt | 2 +- .../bootstrap_repository/adf-build/shared/requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/adf.yml b/.github/workflows/adf.yml index 9e11d30cc..bccae3253 100644 --- a/.github/workflows/adf.yml +++ b/.github/workflows/adf.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.9", "3.10"] + python-version: ["3.9"] steps: - name: Checkout Repo diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/requirements.txt b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/requirements.txt index 9f2b4e8f8..8e6c99e5a 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/requirements.txt +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/requirements.txt @@ -1,6 +1,6 @@ # Install libs here that you might want in AWS CodeBuild (On Master Account) astroid~=2.9.0 -aws-sam-cli==1.36.0 +aws-sam-cli~=1.36 awscli==1.22.26 boto3==1.20.26 botocore==1.23.26 diff --git a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/requirements.txt b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/requirements.txt index a85578489..59b7d49de 100644 --- a/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/requirements.txt +++ b/src/lambda_codebase/initial_commit/bootstrap_repository/adf-build/shared/requirements.txt @@ -50,7 +50,7 @@ aws-cdk.core==1.137 aws-cdk.cx-api==1.137 aws-cdk.region-info==1.137 awscli==1.22.26 -aws-sam-cli==1.36.0 +aws-sam-cli~=1.36 botocore==1.23.26 boto3==1.20.26 mock~=4.0.3 From 7ebb4116de66b75acb20a0d1d1217300a912478c Mon Sep 17 00:00:00 2001 From: Javy de Koning Date: Wed, 10 Aug 2022 20:04:34 +0200 Subject: [PATCH 3/5] Implement GitHub Actions to replace Travis --- tox.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/tox.ini b/tox.ini index 0572bbd95..276901a88 100644 --- a/tox.ini +++ b/tox.ini @@ -32,6 +32,7 @@ deps = -r{toxinidir}/src/lambda_codebase/initial_commit/requirements.txt -r{toxinidir}/src/lambda_codebase/account/requirements.txt -r{toxinidir}/src/lambda_codebase/account_processing/requirements.txt + docutils commands = make test make lint From fc26777785b6ab91c776fd6a5042d192386e99c9 Mon Sep 17 00:00:00 2001 From: Javy de Koning Date: Wed, 10 Aug 2022 20:15:33 +0200 Subject: [PATCH 4/5] Move docutils from tox.ini to requirements.txt --- requirements.txt | 3 ++- tox.ini | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3da561c6a..e8f42949e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ pytest~=6.2.5 pyyaml>=5.4.1 schema~=0.7.5 tox==3.24.4 -cfn-lint~=0.60.1 \ No newline at end of file +cfn-lint~=0.60.1 +docutils~=0.15.2 \ No newline at end of file diff --git a/tox.ini b/tox.ini index 276901a88..0572bbd95 100644 --- a/tox.ini +++ b/tox.ini @@ -32,7 +32,6 @@ deps = -r{toxinidir}/src/lambda_codebase/initial_commit/requirements.txt -r{toxinidir}/src/lambda_codebase/account/requirements.txt -r{toxinidir}/src/lambda_codebase/account_processing/requirements.txt - docutils commands = make test make lint From e7802c5533bd20942b5551c026aed768d23e02c8 Mon Sep 17 00:00:00 2001 From: Javy de Koning Date: Thu, 11 Aug 2022 09:29:57 +0200 Subject: [PATCH 5/5] Removing .travis and comment from gh actions --- .github/workflows/adf.yml | 2 +- .travis.yml | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 .travis.yml diff --git a/.github/workflows/adf.yml b/.github/workflows/adf.yml index bccae3253..3da236166 100644 --- a/.github/workflows/adf.yml +++ b/.github/workflows/adf.yml @@ -25,4 +25,4 @@ jobs: # Run tox using the version of Python in `PATH` run: | tox --version - tox #-e py \ No newline at end of file + tox \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index bdeb3249a..000000000 --- a/.travis.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Enable container based builds -dist: focal -language: python - -python: - - "3.9" - -install: - - nvm install - # Install the code requirements - - make init - -script: - - tox