Backport 58ff4ee8c4ec399528338b59eadea996110366a0

Co-authored-by: George Adams <[email protected]>

Author: judovana

.github/workflows/freetype.vcxproj

@@ -731,13 +731,6 @@ jobs:
         with:
           path: jdk
 
-      - name: Checkout the FreeType source
-        uses: actions/checkout@v4
-        with:
-          repository: "freetype/freetype"
-          ref: VER-2-8-1
-          path: freetype
-
       - name: Restore boot JDK from cache
         id: bootjdk
         uses: actions/cache@v4
@@ -804,18 +797,11 @@ jobs:
       - name: Fix OpenJDK permissions
         run: bash -c "chmod -R 0777 jdk"
 
-      - name: Copy FreeType project file
-        run: >
-          Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
-          Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
-          -Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
-
       - name: Configure
         run: >
           $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
           $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
           $env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
-          $env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
           $env:JT_HOME = cygpath "$HOME/jtreg" ;
           & bash configure
           --with-toolchain-version=2017
@@ -824,7 +810,6 @@ jobs:
           --with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
           --with-build-number=b00
           --with-boot-jdk="$env:BOOT_JDK"
-          --with-freetype-src="$env:FREETYPE_HOME"
           --with-jtreg="$env:JT_HOME" ;
           bash -c "cat $(find -name config.log)"
         working-directory: jdk
@@ -916,13 +901,6 @@ jobs:
         with:
           path: jdk
 
-      - name: Checkout the FreeType source
-        uses: actions/checkout@v4
-        with:
-          repository: "freetype/freetype"
-          ref: VER-2-8-1
-          path: freetype
-
       - name: Restore boot JDK from cache
         id: bootjdk
         uses: actions/cache@v4
@@ -1000,18 +978,11 @@ jobs:
       - name: Fix OpenJDK permissions
         run: bash -c "chmod -R 0777 jdk"
 
-      - name: Copy FreeType project file
-        run: >
-          Remove-Item "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
-          Copy-Item -Path "$env:GITHUB_WORKSPACE\jdk\.github\workflows\freetype.vcxproj"
-          -Destination "$env:GITHUB_WORKSPACE\freetype\builds\windows\vc2010\freetype.vcxproj" ;
-
       - name: Configure
         run: >
           $env:Path = "$HOME\cygwin\cygwin64\bin;$HOME\cygwin\cygwin64\bin;$env:Path" ;
           $env:Path = $env:Path -split ";" -match "C:\\Windows|PowerShell|cygwin" -join ";" ;
           $env:BOOT_JDK = cygpath "$HOME/bootjdk/$env:BOOT_JDK_VERSION" ;
-          $env:FREETYPE_HOME = "$env:GITHUB_WORKSPACE\freetype" ;
           $env:JT_HOME = cygpath "$HOME/jtreg" ;
           & bash configure
           --with-conf-name=windows-x86
@@ -1022,7 +993,6 @@ jobs:
           --with-user-release-suffix="$env:GITHUB_ACTOR-$env:GITHUB_SHA"
           --with-build-number=b00
           --with-boot-jdk="$env:BOOT_JDK"
-          --with-freetype-src="$env:FREETYPE_HOME"
           --with-jtreg="$env:JT_HOME" ;
           bash -c "cat $(find -name config.log)"
         working-directory: jdk