diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-10-17 05:58:34 +0200 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-10-18 22:55:26 +0000 |
| commit | fb88a018ef7c2efd0758018bd1697d21561c4b3c (patch) | |
| tree | 0f0afb6daa9e02f7cf05a74bf2e69686f67e7521 | |
| parent | e8a3d192fb56c4aad70237ca5a3934e976e6e1a6 (diff) | |
Do not use ::add-path:: as it is deprecated
Change-Id: Iec454ad0a850652cb6bd40257c287f13120baca0
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
| -rw-r--r-- | .github/actions/download-qt/action.yml | 4 | ||||
| -rw-r--r-- | .github/actions/download-qtc/action.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/main.yml | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/.github/actions/download-qt/action.yml b/.github/actions/download-qt/action.yml index cf7ade428..7c475b926 100644 --- a/.github/actions/download-qt/action.yml +++ b/.github/actions/download-qt/action.yml @@ -17,6 +17,6 @@ runs: steps: - name: Install Qt run: | - export QT_DIR=$(./scripts/install-qt.sh -d $HOME/Qt --version ${{ inputs.version }} --target ${{ inputs.target }} --toolchain ${{ inputs.toolchain }} qtbase qtdeclarative qttools qtscript qtscxml) - echo ::add-path::$QT_DIR + QT_DIR=$(./scripts/install-qt.sh -d $HOME/Qt --version ${{ inputs.version }} --target ${{ inputs.target }} --toolchain ${{ inputs.toolchain }} qtbase qtdeclarative qttools qtscript qtscxml) + (cygpath -w ${QTC_DIR} 2>/dev/null || echo ${QT_DIR}) >> ${GITHUB_PATH} shell: bash diff --git a/.github/actions/download-qtc/action.yml b/.github/actions/download-qtc/action.yml index ba5486298..4afb56c53 100644 --- a/.github/actions/download-qtc/action.yml +++ b/.github/actions/download-qtc/action.yml @@ -10,6 +10,6 @@ runs: steps: - name: Install Qt Creator run: | - export QTC_DIR=$(./scripts/install-qt.sh -d $HOME/Qt --version ${{ inputs.version }} qtcreator) - echo ::add-path::$QTC_DIR + QTC_DIR=$(./scripts/install-qt.sh -d $HOME/Qt --version ${{ inputs.version }} qtcreator) + (cygpath -w ${QTC_DIR} 2>/dev/null || echo ${QTC_DIR}) >> ${GITHUB_PATH} shell: bash diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3364d3307..54fa31932 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -343,7 +343,7 @@ jobs: - name: Unpack artifact run: mkdir -p release/install-root/ && tar xzf qbs-macos-${{ github.run_id }}.tar.gz -C release/install-root/ - name: Update PATH - run: echo ::add-path::./release/install-root/usr/local/bin + run: echo "./release/install-root/usr/local/bin" >> $GITHUB_PATH - name: Install required packages run: brew install capnp ccache grpc icoutils makensis protobuf p7zip - name: Install Qt @@ -401,8 +401,7 @@ jobs: 7z x ../../qbs-windows-${{ github.run_id }}.zip shell: bash - name: Update PATH - run: echo ::add-path::./release/install-root/bin - shell: bash + run: echo "./release/install-root/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append - name: Install required packages run: choco install -y pkgconfiglite - name: Install Qt |