revert testing changes

xiazhvera · xiazhvera · commit 04432b1d20e4 · 2022-04-13T10:02:42.000-07:00
diff --git a/AWSIoTPythonSDK/__init__.py b/AWSIoTPythonSDK/__init__.py
@@ -1 +1 @@
-__version__ = "1.4.5"
+__version__ = "1.4.9"
diff --git a/continuous-delivery/publish_to_test_pypi.yml b/continuous-delivery/publish_to_test_pypi.yml
@@ -14,7 +14,7 @@ phases:
       - cd aws-iot-device-sdk-python
       - export PKG_VERSION=$(git describe --tags | cut -f2 -dv)
       - echo "Updating package version to ${PKG_VERSION}"
-      #- sed --in-place -E "s/__version__ = \".+\"/__version__ = \"${PKG_VERSION}\"/" AWSIoTPythonSDK/__init__.py
+      - sed --in-place -E "s/__version__ = \".+\"/__version__ = \"${PKG_VERSION}\"/" AWSIoTPythonSDK/__init__.py
   build:
     commands:
       - echo Build started on `date`
diff --git a/continuous-delivery/test_test_pypi.yml b/continuous-delivery/test_test_pypi.yml
@@ -21,7 +21,7 @@ phases:
       - CURRENT_TAG_VERSION=$(git describe --tags | cut -f2 -dv)
       # this is here because typing isn't in testpypi, so pull it from prod instead
       - python3 -m pip install typing
-      - python3 continuous-delivery/pip-install-with-retry.py -i https://testpypi.python.org/simple --user AWSIoTPythonSDK-V1==1.4.5
+      - python3 continuous-delivery/pip-install-with-retry.py -i https://testpypi.python.org/simple --user AWSIoTPythonSDK-V1==$CURRENT_TAG_VERSION
       - python3 samples/greengrass/basicDiscovery.py -e ${ENDPOINT} -c /tmp/certificate.pem -k /tmp/privatekey.pem -r /tmp/AmazonRootCA1.pem --print_discover_resp_only
 
   post_build:
diff --git a/continuous-delivery/test_version_exists b/continuous-delivery/test_version_exists
@@ -7,11 +7,11 @@ git describe --tags
 CURRENT_TAG=$(git describe --tags | cut -f2 -dv)
 # convert v0.2.12-2-g50254a9 to 0.2.12
 CURRENT_TAG_VERSION=$(git describe --tags | cut -f1 -d'-' | cut -f2 -dv)
-# if there's a hash on the tag, then this is not a release tagged commit
-# if [ "$CURRENT_TAG" != "$CURRENT_TAG_VERSION" ]; then
-#     echo "Current tag version is not a release tag, cut a new release if you want to publish."
-#     exit 1
-# fi
+if there's a hash on the tag, then this is not a release tagged commit
+if [ "$CURRENT_TAG" != "$CURRENT_TAG_VERSION" ]; then
+    echo "Current tag version is not a release tag, cut a new release if you want to publish."
+    exit 1
+fi
 
 if python3 -m pip install --no-cache-dir -vvv AWSIoTPythonSDK==$CURRENT_TAG_VERSION; then
     echo "$CURRENT_TAG_VERSION is already in pypi, cut a new tag if you want to upload another version."

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-__version__ = "1.4.5"`
	`1`	`+__version__ = "1.4.9"`