Merge remote-tracking branch 'origin/master' into vision

# Conflicts:
#	.github/workflows/ci.yml

.github/workflows/ci.yml

@@ -321,20 +321,22 @@ jobs:
       run: |
         make docker-run DOCKER_IMAGE_NAME=$DOCKER_IMAGE_NAME ARGS='test-install'
 
-    - name: Upload commit image
-      # Only upload the 10.2 image.
-      if: github.event_name == 'push' && matrix.cuda == '10.2' && github.ref == 'refs/heads/master'
+    - name: Authenticate to Docker Hub
       run: |
         docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-        docker push $DOCKER_IMAGE_NAME
 
-    - name: Upload release image
-      # Only run this for releases.
-      if: github.event_name == 'release'
+    - name: Upload image
+      if: github.event_name == 'release' || github.event_name == 'push'
       run: |
-        docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
         docker push $DOCKER_IMAGE_NAME
 
+    - name: Upload default commit image
+      # CUDA 10.2 is currently our default.
+      if: github.event_name == 'push' && matrix.cuda == '10.2'
+      run: |
+        docker tag $DOCKER_IMAGE_NAME allennlp/commit:${GITHUB_SHA}
+        docker push allennlp/commit:${GITHUB_SHA}
+
     - name: Upload latest image
       # CUDA 10.2 is currently our default.
       if: github.event_name == 'release' && matrix.cuda == '10.2'

CHANGELOG.md

@@ -38,6 +38,9 @@ dataset at every epoch) and a `MultiTaskScheduler` (for ordering the instances w
 
 ## Unreleased (1.x branch)
 
+
+## [v1.2.2](https://github.com/allenai/allennlp/releases/tag/v1.2.2) - 2020-11-17
+
 ### Added
 
 - Added Docker builds for other torch-supported versions of CUDA.

allennlp/version.py

@@ -4,7 +4,7 @@
 _MINOR = "2"
 # On master and in a nightly release the patch should be one ahead of the last
 # released build.
-_PATCH = "1"
+_PATCH = "2"
 # This is mainly for nightly builds which have the suffix ".dev$DATE". See
 # https://semver.org/#is-v123-a-semantic-version for the semantics.
 _SUFFIX = os.environ.get("ALLENNLP_VERSION_SUFFIX", "")