Skip to content

Commit

Permalink
Merge branch 'development' into dependabot/github_actions/development…
Browse files Browse the repository at this point in the history
…/actions/github-script-7.0.1
  • Loading branch information
MikeDombo authored Jan 17, 2024
2 parents 7698063 + 0f42d3e commit e4d864a
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 14 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,17 @@ jobs:
uses: wagoid/commitlint-github-action@v5
if: matrix.os == 'ubuntu-latest'
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Python version
- name: Install CLI and dependencies
run: |
python -VV
python -m pip install --upgrade pip
# Perform clean install without test dependencies to ensure none of test dependencies
# have been used in the gdk codebase.
pip install .
gdk --help
- name: Lint with flake8
run: |
pip install flake8
Expand Down Expand Up @@ -71,7 +75,7 @@ jobs:
aws-region: us-east-1
if: ${{ github.event.pull_request.head.repo.full_name == github.repository || github.event_name == 'push'}}
- name: Set up JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: corretto
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/Regression.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
max-parallel: 6
matrix:
gdk-version: [ HEAD, v1.6.0, v1.5.0]
gdk-version: [ HEAD, v1.6.2, v1.6.1]
python-version: [3.7, 3.8, 3.x]
os: [windows-latest, ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
Expand All @@ -28,7 +28,7 @@ jobs:
ref: ${{ matrix.gdk-version == 'HEAD' && github.ref || matrix.gdk-version }}
fetch-depth: 0
- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
- name: Install CLI and dependencies
Expand All @@ -45,7 +45,7 @@ jobs:
role-to-assume: ${{secrets.GDK_WORKFLOW_AWS_ROLE}}
aws-region: us-east-1
- name: Set up JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: 8
distribution: corretto
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ Please follow the [GDK CLI public documentation](https://docs.aws.amazon.com/gre

To install the latest version of CLI using this git repository and pip, run the following command

`pip3 install git+https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.1`
`pip3 install git+https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.2`

Run `gdk --help` to check if the cli tool is successfully installed.

Expand Down
2 changes: 1 addition & 1 deletion gdk/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.6.1"
__version__ = "1.6.2"
7 changes: 3 additions & 4 deletions gdk/common/config/TestConfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,11 @@ def _set_gtf_config(self, test_config):
if release_name is not None:
self.gtf_version = release_name
self.latest_gtf_version = release_name
logging.info("Discovered %s as latest GTF release name.", self.gtf_version)
logging.debug("Discovered %s as latest GTF release name.", self.gtf_version)
else:
logging.info("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version)
logging.debug("GTF release name was found to be None, so using default.")
logging.debug("GTF release name was found to be None. Using %s as the default value.", self.gtf_version)
except Exception as e:
logging.info("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version)
logging.debug("Unable to get the latest GTF release name. Using %s as the default value.", self.gtf_version)
logging.debug("Exception information for GTF release name API call: %s", str(e))
self.gtf_version = (test_config.get("gtf_version")
if "gtf_version" in test_config
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ def get_version(rel_path):
long_description=long_description,
long_description_content_type="text/markdown",
license=license,
packages=find_packages(),
packages=find_packages(include=["gdk", "gdk.*"]),
entry_points=entry_points,
classifiers=classifiers,
install_requires=get_requirements(),
Expand Down
2 changes: 1 addition & 1 deletion uat/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ End-to-end setup uses `pytest` and expects test dependencies to be installed.
To install the latest version of CLI using this git repository and pip, run the following command

```shell
git clone https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.1
git clone https://github.com/aws-greengrass/aws-greengrass-gdk-cli.git@v1.6.2
cd aws-greengrass-gdk-cli
```

Expand Down

0 comments on commit e4d864a

Please sign in to comment.