From 0c9906c5bb29db3dd644a4482fe2b2ec24e81039 Mon Sep 17 00:00:00 2001 From: Bert Blommers Date: Thu, 25 Aug 2022 19:03:30 +0000 Subject: [PATCH] Admin: Update Github Actions (#5422) --- .github/workflows/build.yml | 36 ++++++++++---------- .github/workflows/dependency_test.yml | 6 ++-- .github/workflows/dockertests.yml | 30 ++++++++-------- .github/workflows/release.yml | 10 +++--- .github/workflows/test_outdated_versions.yml | 4 +-- .github/workflows/test_terraform.yml | 4 +-- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c949ecd88..50f14cc91 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,9 +11,9 @@ jobs: python-version: [ 3.6, 3.7, 3.8, 3.9, "3.10" ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Get pip cache dir @@ -22,7 +22,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: pip cache id: pip-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache-dir.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4 @@ -43,9 +43,9 @@ jobs: matrix: python-version: [3.7] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} # Retrieve the previously cached dependencies @@ -54,7 +54,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4 @@ -80,11 +80,11 @@ jobs: python-version: [3.6, 3.7, 3.8, 3.9, "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Get pip cache dir @@ -92,7 +92,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4 @@ -125,11 +125,11 @@ jobs: python-version: [3.6, 3.7, 3.8, 3.9, "3.10"] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Start MotoServer @@ -142,7 +142,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }}-4 @@ -174,7 +174,7 @@ jobs: docker stop motoserver - name: Archive TF logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: motoserver-${{ matrix.python-version }} path: | @@ -189,11 +189,11 @@ jobs: matrix: python-version: [3.8] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Update & Build @@ -202,7 +202,7 @@ jobs: python update_version_from_git.py python setup.py sdist bdist_wheel - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_API_TOKEN }} - name: Build Docker release @@ -211,9 +211,9 @@ jobs: # Required to get the correct Digest # See https://github.com/docker/build-push-action/issues/461 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/dependency_test.yml b/.github/workflows/dependency_test.yml index ea814dc0c..ff64bd4f4 100644 --- a/.github/workflows/dependency_test.yml +++ b/.github/workflows/dependency_test.yml @@ -15,9 +15,9 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Run test @@ -28,7 +28,7 @@ jobs: scripts/dependency_test.sh - name: Archive logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: buildfolder-${{ matrix.python-version }} path: | diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 0245c47b4..27aa3f492 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -11,9 +11,9 @@ jobs: python-version: [ 3.9 ] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Get pip cache dir @@ -22,7 +22,7 @@ jobs: echo "::set-output name=dir::$(pip cache dir)" - name: pip cache id: pip-cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache-dir.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} @@ -44,11 +44,11 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Start MotoServer on an unusual port @@ -61,7 +61,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} @@ -87,7 +87,7 @@ jobs: docker stop motoserver - name: Archive Logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: motoserver-${{ matrix.python-version }} path: | @@ -102,11 +102,11 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Start MotoServer on a custom Docker network bridge @@ -120,7 +120,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} @@ -144,7 +144,7 @@ jobs: cp server_output.log serverlogs2/server_output.log - name: Archive logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: motoserver-${{ matrix.python-version }} path: | @@ -159,11 +159,11 @@ jobs: python-version: [3.9] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Start MotoServer on an unusual port @@ -176,7 +176,7 @@ jobs: run: | echo "::set-output name=dir::$(pip cache dir)" - name: pip cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ steps.pip-cache.outputs.dir }} key: pip-${{ matrix.python-version }}-${{ hashFiles('**/setup.py') }} @@ -202,7 +202,7 @@ jobs: cp server_output.log serverlogs3/server_output.log - name: Archive Logs if: always() - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: motoserver-${{ matrix.python-version }} path: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9efae9617..5d9d000a1 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,11 +17,11 @@ jobs: - name: Set Env run: | echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 - name: Set up Python 3.8 - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: 3.8 - name: Install dependencies @@ -39,7 +39,7 @@ jobs: - name: Build run: python setup.py sdist bdist_wheel - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@master + uses: pypa/gh-action-pypi-publish@release/v1 with: password: ${{ secrets.PYPI_API_TOKEN }} - name: Tag version on Github @@ -52,9 +52,9 @@ jobs: # Required to get the correct Digest # See https://github.com/docker/build-push-action/issues/461 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to DockerHub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/test_outdated_versions.yml b/.github/workflows/test_outdated_versions.yml index 6ffbcd4d8..63eabd7bd 100644 --- a/.github/workflows/test_outdated_versions.yml +++ b/.github/workflows/test_outdated_versions.yml @@ -20,10 +20,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} diff --git a/.github/workflows/test_terraform.yml b/.github/workflows/test_terraform.yml index 8581f87f2..593eabf09 100644 --- a/.github/workflows/test_terraform.yml +++ b/.github/workflows/test_terraform.yml @@ -26,7 +26,7 @@ jobs: with: submodules: 'true' - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v2 + uses: actions/setup-python@v4 with: python-version: ${{ matrix.python-version }} - name: Start MotoServer @@ -35,7 +35,7 @@ jobs: docker run --rm -t --name motoserver -e TEST_SERVER_MODE=true -e MOTO_PORT=4566 -e AWS_SECRET_ACCESS_KEY=server_secret -e AWS_ACCESS_KEY_ID=server_key -v `pwd`:/moto -p 4566:4566 -v /var/run/docker.sock:/var/run/docker.sock python:3.7-buster /moto/scripts/ci_moto_server.sh & MOTO_PORT=4566 python scripts/ci_wait_for_server.py - name: Download Cache - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: | ~/go/pkg/mod