diff options
| -rw-r--r-- | .github/workflows/main.yml | 20 | ||||
| -rw-r--r-- | etc/ci/generate_workflow.py | 4 | ||||
| -rw-r--r-- | etc/ci/workflow.mako | 20 |
3 files changed, 19 insertions, 25 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4a1cbde4318..13e6e51228a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,26 +19,24 @@ jobs: name: Build (Windows) runs-on: windows-2019 steps: - - name: Clone - run: | - mkdir c:/Repo - git clone https://github.com/${{ github.repository }} --depth 2 c:/Repo - cd c:/Repo - git fetch origin ${{ github.ref }} - git checkout ${{ github.sha }} + - uses: actions/checkout@v2 + with: + fetch-depth: 2 + - name: Copy to C drive + run: cp D:\a C:\ -Recurse - name: Bootstrap - working-directory: c:/Repo + working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}" run: | python -m pip install --upgrade pip virtualenv python mach fetch - name: Release build - working-directory: c:/Repo + working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}" run: python mach build --release --media-stack=dummy - name: Unit tests - working-directory: c:/Repo + working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}" run: python mach test-unit --release - name: Smoketest - working-directory: c:/Repo + working-directory: "C:\\a\\${{ github.event.repository.name }}\\${{ github.event.repository.name }}" run: python mach smoketest --angle build-mac: diff --git a/etc/ci/generate_workflow.py b/etc/ci/generate_workflow.py index 9abf03e4784..92bb0e7faaa 100644 --- a/etc/ci/generate_workflow.py +++ b/etc/ci/generate_workflow.py @@ -49,9 +49,7 @@ def main(): f.write(render( 'workflow.mako', total_chunks=20, - GITHUB_REPOSITORY="${{ github.repository }}", - GITHUB_REF="${{ github.ref }}", - GITHUB_SHA="${{ github.sha }}", + REPOSITORY_NAME="${{ github.event.repository.name }}", )) diff --git a/etc/ci/workflow.mako b/etc/ci/workflow.mako index bd8f4c3bf45..abc2ae26be6 100644 --- a/etc/ci/workflow.mako +++ b/etc/ci/workflow.mako @@ -19,26 +19,24 @@ jobs: name: Build (Windows) runs-on: windows-2019 steps: - - name: Clone - run: | - mkdir c:/Repo - git clone https://github.com/${ GITHUB_REPOSITORY } --depth 2 c:/Repo - cd c:/Repo - git fetch origin ${ GITHUB_REF } - git checkout ${ GITHUB_SHA } + - uses: actions/checkout@v2 + with: + fetch-depth: 2 + - name: Copy to C drive + run: cp D:\a C:\ -Recurse - name: Bootstrap - working-directory: c:/Repo + working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }" run: | python -m pip install --upgrade pip virtualenv python mach fetch - name: Release build - working-directory: c:/Repo + working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }" run: python mach build --release --media-stack=dummy - name: Unit tests - working-directory: c:/Repo + working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }" run: python mach test-unit --release - name: Smoketest - working-directory: c:/Repo + working-directory: "C:\\a\\${ REPOSITORY_NAME }\\${ REPOSITORY_NAME }" run: python mach smoketest --angle build-mac: |