diff --git a/.github/actions/vcpkg-cache/action.yml b/.github/actions/vcpkg-cache/action.yml index f9f56dd..228b8b8 100644 --- a/.github/actions/vcpkg-cache/action.yml +++ b/.github/actions/vcpkg-cache/action.yml @@ -1,9 +1,4 @@ name: 'Setup vcpkg cache' -inputs: - vcpkg-root-path: - description: 'Path where to install vcpkg' - required: true - type: string runs: using: "composite" steps: @@ -13,20 +8,18 @@ runs: run: | echo "Installing vcpkg" - VCPKG_DIR=${{ inputs.vcpkg-root-path }} - echo "before VCPKG_DIR=$VCPKG_DIR" - VCPKG_DIR="${VCPKG_DIR//\\//}" # Convert backslashes to forward slashes for compatibility - echo "after VCPKG_DIR=$VCPKG_DIR" + VCPKG_DIR=${{ runner.temp }}/.vcpkg-cache + echo "VCPKG_DIR=$VCPKG_DIR" - echo "VCPKG_INSTALLATION_ROOT=$VCPKG_DIR" >> $GITHUB_ENV - echo "PATH=$VCPKG_DIR:$PATH" >> $GITHUB_ENV - echo "VCPKG_DEFAULT_BINARY_CACHE=$VCPKG_DIR/.cache" >> $GITHUB_ENV + echo "VCPKG_DEFAULT_BINARY_CACHE=$VCPKG_DIR" >> $GITHUB_ENV which vcpkg - git clone https://github.com/microsoft/vcpkg.git - cd vcpkg - ./bootstrap-vcpkg.sh --disableMetrics - mkdir $VCPKG_DIR/.cache + #git clone https://github.com/microsoft/vcpkg.git + #cd vcpkg + #./bootstrap-vcpkg.sh --disableMetrics + mkdir -p $VCPKG_DIR + cd $VCPKG_DIR + ls - name: cmdll vcpkg Windows shell: cmd @@ -34,20 +27,19 @@ runs: run: | echo "Installing vcpkg" - set VCPKG_DIR=${{ inputs.vcpkg-root-path }} + set VCPKG_DIR=${{ runner.temp }}\.vcpkg-cache echo "VCPKG_DIR=%VCPKG_DIR%" - echo "Vcpkg is installed at: %VCPKG_INSTALLATION_ROOT%" - echo VCPKG_INSTALLATION_ROOT=%VCPKG_DIR%>> %GITHUB_ENV% - echo VCPKG_DEFAULT_BINARY_CACHE=%VCPKG_DIR%\.cache>> %GITHUB_ENV% - echo PATH=%VCPKG_DIR%;%PATH%>> %GITHUB_ENV% + echo VCPKG_DEFAULT_BINARY_CACHE=%VCPKG_DIR%>> %GITHUB_ENV% where vcpkg - git clone https://github.com/microsoft/vcpkg.git - cd vcpkg - call .\bootstrap-vcpkg.bat - mkdir "%VCPKG_DIR%\.cache" + #git clone https://github.com/microsoft/vcpkg.git + #cd vcpkg + #call .\bootstrap-vcpkg.bat + mkdir "%VCPKG_DIR%" + cd %VCPKG_DIR% + dir - name: Env if: False @@ -67,8 +59,7 @@ runs: uses: actions/cache@v4 with: enableCrossOsArchive: true - path: | - ${{ inputs.vcpkg-root-path }}/.cache + path: ${{ runner.temp }}/.vcpkg-cache key: ${{ runner.os }}-vcpkg-${{ hashFiles('**/vcpkg.json') }} restore-keys: | ${{ runner.os }}-vcpkg- diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b6ed00..7743ba0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,9 +12,6 @@ jobs: build: - env: - VCPKG_INSTALLATION_ROOT: ${{ github.workspace }}/vcpkg - runs-on: ${{ matrix.os }} strategy: matrix: @@ -44,8 +41,6 @@ jobs: - name: Setup cache uses: ./.github/actions/vcpkg-cache - with: - vcpkg-root-path: ${{ env.VCPKG_INSTALLATION_ROOT }} - name: Configure project run: |