From 1a5ee99c8a68868ca780af0755f8d83340d99674 Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Fri, 20 Mar 2020 19:32:06 +0300
Subject: [PATCH] Updated checkout Github Action to v2.

---
 .github/workflows/linux.yml | 24 ++++++++++++------------
 .github/workflows/mac.yml   |  9 ++-------
 .github/workflows/snap.yml  |  2 +-
 .github/workflows/win.yml   |  9 ++-------
 4 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 3e26e82173..67d9f1ab96 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -40,11 +40,6 @@ jobs:
       - name: Get repository name.
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
-      - name: Clone.
-        uses: actions/checkout@v1
-        with:
-          submodules: recursive
-
       - name: Disable man for further package installs.
         run: |
           cfgFile="/etc/dpkg/dpkg.cfg.d/no_man"
@@ -57,17 +52,13 @@ jobs:
           p locale
           p doc
 
-      - name: First set up.
+      - name: Apt install.
         shell: bash
         run: |
-          cd ..
-          mv $REPO_NAME temp
-          mkdir $REPO_NAME
-          mv temp $REPO_NAME/$REPO_NAME
-          cd $REPO_NAME
-
           sudo apt-get update
           sudo apt-get install software-properties-common -y && \
+          sudo add-apt-repository ppa:git-core/ppa -y && \
+          sudo apt-get update && \
           sudo apt-get install git libexif-dev liblzma-dev libz-dev libssl-dev \
           libgtk2.0-dev libice-dev libsm-dev libicu-dev libdrm-dev dh-autoreconf \
           autoconf automake build-essential libxml2-dev libass-dev libfreetype6-dev \
@@ -86,6 +77,15 @@ jobs:
           sudo update-alternatives --config gcc && \
           sudo add-apt-repository --remove ppa:ubuntu-toolchain-r/test -y
 
+      - name: Clone.
+        uses: actions/checkout@v2
+        with:
+          submodules: recursive
+          path: ${{ env.REPO_NAME }}
+
+      - name: First set up.
+        shell: bash
+        run: |
           gcc --version
 
           gcc --version > CACHE_KEY.txt
diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml
index 7713139ed2..9ded71821e 100644
--- a/.github/workflows/mac.yml
+++ b/.github/workflows/mac.yml
@@ -42,18 +42,13 @@ jobs:
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
+          path: ${{ env.REPO_NAME }}
 
       - name: First set up.
         run: |
-          cd ..
-          mv $REPO_NAME temp
-          mkdir $REPO_NAME
-          mv temp $REPO_NAME/$REPO_NAME
-          cd $REPO_NAME
-
           brew install automake fdk-aac lame libass libtool libvorbis libvpx \
           ninja opus sdl shtool texi2html theora x264 xvid yasm pkg-config
 
diff --git a/.github/workflows/snap.yml b/.github/workflows/snap.yml
index 8a5767e58e..8ff2c7947b 100644
--- a/.github/workflows/snap.yml
+++ b/.github/workflows/snap.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
 
diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index e6113fe3f6..f28b588600 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -38,19 +38,14 @@ jobs:
         run: echo ::set-env name=REPO_NAME::${GITHUB_REPOSITORY##*/}
 
       - name: Clone.
-        uses: actions/checkout@v1
+        uses: actions/checkout@v2
         with:
           submodules: recursive
+          path: ${{ env.REPO_NAME }}
 
       - name: Set up environment variables.
         shell: cmd
         run: |
-          cd ..
-          move %REPO_NAME% temp
-          mkdir %REPO_NAME%
-          move temp %REPO_NAME%/%REPO_NAME%
-          cd %REPO_NAME%
-
           echo ::add-path::C:\Strawberry\perl\bin\
           echo ::add-path::"%programfiles%\NASM"