Merge branch 'github-actions-upgrade'

DFHack · Jul 2, 2020 · e4b5898 · e4b5898
2 parents 5e300e6 + fafa135
commit e4b5898
Showing 1 changed file with 19 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,11 +6,15 @@ jobs:
   docs:
     runs-on: ubuntu-18.04
     steps:
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
     - name: Install dependencies
       run: |
-        sudo pip3 install --system sphinx
+        pip install sphinx
     - name: Clone scripts
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Set up DFHack
       run: |
         git clone git://github.com/dfhack/dfhack $HOME/dfhack --depth 1 --branch develop
@@ -21,7 +25,7 @@ jobs:
       run: |
         sphinx-build -qW -j3 $HOME/dfhack html
     - name: Check for missing docs
-      run: python3 $HOME/dfhack/travis/script-docs.py .
+      run: python $HOME/dfhack/travis/script-docs.py .
     - name: Upload docs
       if: success() || failure()
       uses: actions/upload-artifact@master
@@ -31,22 +35,30 @@ jobs:
   lint:
     runs-on: ubuntu-18.04
     steps:
+    - name: Set up Python 3
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3
+    - name: Set up Ruby 2.7
+      uses: actions/setup-ruby@v1
+      with:
+        ruby-version: 2.7
     - name: Install dependencies
       run: |
         sudo apt-get update
         sudo apt-get install lua5.3
     - name: Clone scripts
-      uses: actions/checkout@v1
+      uses: actions/checkout@v2
     - name: Set up DFHack
       run: |
         git clone git://github.com/dfhack/dfhack $HOME/dfhack --depth 1 --branch develop
         rmdir $HOME/dfhack/scripts
         ln -sv $(pwd) $HOME/dfhack/scripts
     - name: Check whitespace
-      run: python3 $HOME/dfhack/travis/lint.py
+      run: python $HOME/dfhack/travis/lint.py
     - name: Check Lua syntax
       if: success() || failure()
-      run: python3 $HOME/dfhack/travis/script-syntax.py --ext=lua --cmd="luac5.3 -p"
+      run: python $HOME/dfhack/travis/script-syntax.py --ext=lua --cmd="luac5.3 -p" --github-actions
     - name: Check Ruby syntax
       if: success() || failure()
-      run: python3 $HOME/dfhack/travis/script-syntax.py --ext=rb --cmd="ruby -c"
+      run: python $HOME/dfhack/travis/script-syntax.py --ext=rb --cmd="ruby -c" --github-actions