Master updates for Release-2020.03 (#2255)

* Update CI and README * Update CI * Update CI
livaage · Mar 19, 2021 · f896dca · f896dca
1 parent 2abb519
commit f896dca
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 18 deletions.
diff --git a/.github/workflows/ci-release-2020.06.yml → .github/workflows/ci-release-2021.03.yml b/.github/workflows/ci-release-2020.06.yml → .github/workflows/ci-release-2021.03.yml
@@ -1,4 +1,4 @@
-name: Garage CI Release-2020.06
+name: Garage CI release-2021.03
 
 env:
   GARAGE_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -25,23 +25,46 @@ jobs:
         run: docker version
       - uses: actions/checkout@v2
         with:
-          ref: release-2020.06
+          ref: release-2021.03
       - name: Login to GitHub Package Registry
         run: echo ${{ secrets.CI_REGISTRY_TOKEN }} | docker login docker.pkg.github.com -u ${CI_USER} --password-stdin
       - name: Build Docker container
         run: |
-          docker build . \
+          DOCKER_BUILDKIT=1 docker build . \
             -f docker/Dockerfile \
-            --target garage-dev-18.04 \
+            --target garage-dev \
             -t "${DOCKER_TAG}" \
             --build-arg GARAGE_GH_TOKEN \
-            --cache-from="docker.pkg.github.com/${OWNER}/${DOCKER_CACHE_REPO}/${DOCKER_TAG}"
+            --cache-from="rlworkgroup/garage"
       - name: Push to cache (GitHub Package Registry)
         run: |
           docker tag "${DOCKER_TAG}" "docker.pkg.github.com/${OWNER}/${DOCKER_CACHE_REPO}/${DOCKER_TAG}"
           docker push "docker.pkg.github.com/${OWNER}/${DOCKER_CACHE_REPO}/${DOCKER_TAG}"
 
 
+  doctest:
+    name: Run Doctest
+    runs-on: ubuntu-latest
+    needs: build_docker_container
+
+    steps:
+    - name: Login to GitHub Package Registry
+      run: echo ${{ secrets.CI_REGISTRY_TOKEN }} | docker login docker.pkg.github.com -u ${CI_USER} --password-stdin
+    - name: Pull from cache (GitHub Package Registry)
+      run: docker pull "docker.pkg.github.com/${OWNER}/${DOCKER_CACHE_REPO}/${DOCKER_TAG}"
+    - name: Tag docker image
+      run: docker tag docker.pkg.github.com/${OWNER}/${DOCKER_CACHE_REPO}/${DOCKER_TAG} ${DOCKER_TAG}
+    - name: Doctest
+      run: |
+        docker run \
+          -e MJKEY \
+          --memory 6500m \
+          --memory-swap 6500m \
+          "${DOCKER_TAG}" \
+          /bin/bash -c \
+          'pushd docs && make doctest clean && popd'
+
+
   normal_test:
     name: Normal Tests
     runs-on: ubuntu-latest
@@ -66,7 +89,7 @@ jobs:
           "${DOCKER_TAG}" \
           /bin/bash -c \
           '[ ! -f ${MJKEY_PATH} ] || mv ${MJKEY_PATH} ${MJKEY_PATH}.bak &&
-          pytest --cov=garage --cov-report=xml -m \
+          pytest --cov=garage --reruns 1 --cov-report=xml -m \
               "not nightly and not huge and not flaky and not large and not mujoco and not mujoco_long" --durations=20 &&
           for i in {1..5}; do
               bash <(curl -s https://codecov.io/bash --retry 5) -Z && break
@@ -103,7 +126,7 @@ jobs:
           "${DOCKER_TAG}" \
           /bin/bash -c \
           '[ ! -f ${MJKEY_PATH} ] || mv ${MJKEY_PATH} ${MJKEY_PATH}.bak &&
-          pytest --cov=garage --cov-report=xml -m "large and not flaky" --durations=20 &&
+          pytest --cov=garage --cov-report=xml --reruns 1 -m "large and not flaky" --durations=20 &&
           for i in {1..5}; do
               bash <(curl -s https://codecov.io/bash --retry 5) -Z && break
               if [ $i == 5 ]; then
@@ -139,7 +162,7 @@ jobs:
           --memory-swap 6500m \
           "${DOCKER_TAG}" \
           /bin/bash -c \
-          'pytest --cov=garage --cov-report=xml -m "mujoco and not flaky" --durations=20 &&
+          'pytest --cov=garage --cov-report=xml --reruns 1 -m "mujoco and not flaky" --durations=20 &&
           for i in {1..5}; do
               bash <(curl -s https://codecov.io/bash --retry 5) -Z && break
               if [ $i == 5 ]; then
@@ -175,7 +198,7 @@ jobs:
           --memory-swap 6500m \
           "${DOCKER_TAG}" \
           /bin/bash -c \
-          'pytest --cov=garage --cov-report=xml -m "mujoco_long and not flaky" --durations=20 &&
+          'pytest --cov=garage --cov-report=xml --reruns 1 -m "mujoco_long and not flaky" --durations=20 &&
           for i in {1..5}; do
               bash <(curl -s https://codecov.io/bash --retry 5) -Z && break
               if [ $i == 5 ]; then
@@ -242,7 +265,7 @@ jobs:
           ${CONDA} update -q conda && \
           ${CONDA} init && \
           ${CONDA} info -a && \
-          ${CONDA} create -n garage-ci python=3.5 pip -y && \
+          ${CONDA} create -n garage-ci python=3.6 pip -y && \
           ${GARAGE_BIN}/pip install --upgrade pip setuptools && \
           ${GARAGE_BIN}/pip install dist/garage.tar.gz[all,dev] && \
           ${GARAGE_BIN}/pylint --disable=all --enable=import-error garage'
@@ -275,7 +298,7 @@ jobs:
           touch \${MJKEY_PATH} && \
           pip3 install --upgrade pip setuptools && \
           pip3 install pipenv && \
-          pipenv --python=3.5 && \
+          pipenv --python=3.6 && \
           pipenv install dist/garage.tar.gz[all,dev] && \
           pipenv graph && \
           # pylint will verify all imports work
@@ -285,7 +308,7 @@ jobs:
   delete_docker_container:
     name: Delete Docker Container
     runs-on: ubuntu-latest
-    needs: [normal_test, large_test, mujoco_test, mujoco_test_long, nightly_test, verify_envs_conda, verify_envs_pipenv]
+    needs: [doctest, normal_test, large_test, mujoco_test, mujoco_test_long, nightly_test, verify_envs_conda, verify_envs_pipenv]
     if: always()
 
     steps:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,8 +19,7 @@ on:
       - master
     # Triggers on release candidates from master
     tags:
-      - 'v[1-9][0-9]*.[0-9]+.[0-9]+rc[0-9]'
-      - 'v2020.06.[0-9]+rc[0-9]'
+      - 'v20[2-9][0-9].[0-9][0-9].[0-9]+rc[0-9]'
   pull_request:
     branches:
       - master

diff --git a/README.md b/README.md
@@ -137,12 +137,11 @@ Our testing strategy has three pillars:
 
 | Release | Build Status | Last date of support |
 | ------- | ------------ | -------------------- |
-| [v2020.06](https://github.com/rlworkgroup/garage/releases/tag/v2020.06.0) | [![Garage CI Release-2020.06](https://github.com/rlworkgroup/garage/workflows/Garage%20CI%20Release-2020.06/badge.svg)](https://github.com/rlworkgroup/garage/actions?query=workflow%3A%22Garage+CI+Release-2020.06%22) | February 28th, 2021 |
+| [v2021.03](https://github.com/rlworkgroup/garage/releases/tag/v2021.03.0) | [![Garage CI Release-2021.03](https://github.com/rlworkgroup/garage/workflows/Garage%20CI%20Release-2021.03/badge.svg)](https://github.com/rlworkgroup/garage/actions?query=workflow%3A%22Garage+CI+Release-2021.03%22) | May 31st, 2021 |
 
-Garage releases a new stable version approximately every 4 months, in February,
-June, and October. Maintenance releases have a stable API and dependency tree,
+Maintenance releases have a stable API and dependency tree,
 and receive bug fixes and critical improvements but not new features. We
-currently support each release for a window of 8 months.
+currently support each release for a window of 2 months.
 
 ## Citing garage