Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: GH action checkout bug #2924

Merged
merged 19 commits into from
May 16, 2022
Merged
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,8 @@ jobs:
tar -xf "${GITHUB_WORKSPACE}/workspace/target/OpenJDK.tar.gz" -C "${HOME}/JDK"
- name: Set root of jdk image dir
run: |
imageroot=`find ${HOME}/JDK -name release -type f`
echo "TEST_JDK_HOME=`dirname ${imageroot}`" >> $GITHUB_ENV
imageroot=$(find "${HOME}/JDK" -name release -type f)
echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV"
- name: Smoke test
uses: adoptium/run-aqa@v1
with:
Expand Down Expand Up @@ -154,8 +154,8 @@ jobs:

- name: Set root of jdk image dir
run: |
imageroot=`find ${HOME}/JDK -name release -type f`
echo "TEST_JDK_HOME=`dirname ${imageroot}`" >> $GITHUB_ENV
imageroot=$(find "${HOME}/JDK" -name release -type f)
echo "TEST_JDK_HOME=$(dirname "${imageroot}")" >> "$GITHUB_ENV"
- name: Smoke test
uses: adoptium/run-aqa@v1
with:
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
Start-Process -Wait -FilePath 'C:\temp\git.exe' -ArgumentList '/SILENT /ALLOWDOWNGRADE=1** /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh"'

- name: Set PATH
run: echo "C:\cygwin64\bin;C:\Program Files\Git\bin;" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
run: echo "C:\cygwin64\bin;C:\Program Files\Git\bin;" | Out-File -FilePath "$env:GITHUB_PATH" -Encoding utf8 -Append

- name: Install Visual Studio 2013
run: |
Expand All @@ -225,18 +225,19 @@ jobs:

- name: Cygwin git configuration
shell: bash
run: mkdir $HOME && git config --system core.autocrlf false
# workaround for https://github.com/actions/checkout/issues/760
run: mkdir "$HOME" && git config --system core.autocrlf false && git config --global --add safe.directory "/cygdrive/d/a/temurin-build/temurin-build"
karianna marked this conversation as resolved.
Show resolved Hide resolved

- uses: actions/checkout@v2

- name: Setup 8dot3name
run: fsutil behavior set disable8dot3 0

- name: Set JAVA_HOME
run: echo "JAVA_HOME=$(cygpath ${{ steps.setup-java11.outputs.path }})" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
run: echo "JAVA_HOME=$(cygpath "${{ steps.setup-java11.outputs.path }}")" | Out-File -FilePath "$env:GITHUB_ENV" -Encoding utf8 -Append

- name: Set JDK7_BOOT_DIR
run: echo "JDK7_BOOT_DIR=$(cygpath ${{ steps.setup-java7.outputs.path }})" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
run: echo "JDK7_BOOT_DIR=$(cygpath "${{ steps.setup-java7.outputs.path }}")" | Out-File -FilePath "$env:GITHUB_ENV" -Encoding utf8 -Append
if: matrix.version == 'jdk8u'

- name: Build Windows
Expand Down Expand Up @@ -267,8 +268,8 @@ jobs:

- name: Set root of jdk image dir
run: |
$imageroot = find ${HOME}/${{matrix.version}}-${{matrix.os}}-${{matrix.vm}} -name release -type f
echo "TEST_JDK_HOME=$(dirname ${imageroot})" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
imageroot=$(find "${HOME}/${{matrix.version}}-${{matrix.os}}-${{matrix.vm}}" -name release -type f)
echo "TEST_JDK_HOME=$(dirname "${imageroot}")" | Out-File -FilePath "$env:GITHUB_ENV" -Encoding utf8 -Append
- name: Smoke test
uses: adoptium/run-aqa@v1
with:
Expand Down