https://git.reactos.org/?p=reactos.git;a=commitdiff;h=05a5edef12c20b0828d88594b439d55479fd0f54
commit 05a5edef12c20b0828d88594b439d55479fd0f54 Author: Victor Perevertkin <[email protected]> AuthorDate: Mon Nov 9 00:08:18 2020 +0300 Commit: Victor Perevertkin <[email protected]> CommitDate: Mon Nov 9 00:08:18 2020 +0300 [GITHUB] Enable amd64 artefacts and other minor changes - Enable artefacts upload for amd64 builds - Use environment files instead of ::set-env due to security issue - Upgrade upload-artifact and cache packages to v2 --- .github/workflows/build.yml | 56 ++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5cae31e3834..a3c56f1c208 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -17,7 +17,7 @@ jobs: with: path: src - name: Set up cache for ccache - uses: actions/cache@v1 + uses: actions/cache@v2 with: path: ccache key: ccache-gcc-i386-${{github.sha}} @@ -25,10 +25,10 @@ jobs: ccache-gcc-i386- - name: Set ccache settings run: | - echo "::set-env name=CCACHE_BASEDIR::${{github.workspace}}" - echo "::set-env name=CCACHE_DIR::${{github.workspace}}/ccache" - echo "::set-env name=CCACHE_MAXSIZE::1G" - echo "::set-env name=CCACHE_SLOPPINESS::time_macros" + echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV + echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV + echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV + echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV - name: Configure run: | mkdir build @@ -45,12 +45,12 @@ jobs: - name: Print ccache statistics run: ccache -s - name: Upload bootcd - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: reactos-gcc-i386-${{github.sha}} path: build/bootcd.iso - name: Upload livecd - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: reactos-gcc-i386-${{github.sha}} path: build/livecd.iso @@ -65,9 +65,9 @@ jobs: run: | curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin - echo "::add-path::${{github.workspace}}\bin" - echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" - echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" + echo "${{github.workspace}}\bin" >> $GITHUB_PATH + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV + echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV - name: Add CL to PATH uses: ilammy/msvc-dev-cmd@v1 with: @@ -100,9 +100,9 @@ jobs: run: | curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin - echo "::add-path::${{github.workspace}}\bin" - echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" - echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" + echo "${{github.workspace}}\bin" >> $GITHUB_PATH + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV + echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV - name: Add CL to PATH uses: ilammy/msvc-dev-cmd@v1 with: @@ -124,12 +124,12 @@ jobs: cmake --build . --target bootcd cmake --build . --target livecd - name: Upload bootcd - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: reactos-msvc-i386-${{github.sha}} path: build/bootcd.iso - name: Upload livecd - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: reactos-msvc-i386-${{github.sha}} path: build/livecd.iso @@ -144,9 +144,9 @@ jobs: run: | curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z 7z x flexbison.7z -O${{github.workspace}}\bin - echo "::add-path::${{github.workspace}}\bin" - echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" - echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" + echo "${{github.workspace}}\bin" >> $GITHUB_PATH + echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV + echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV - name: Add CL to PATH uses: ilammy/msvc-dev-cmd@v1 with: @@ -168,13 +168,13 @@ jobs: run: | cmake --build . --target bootcd cmake --build . --target livecd - # - name: Upload bootcd - # uses: actions/upload-artifact@v1 - # with: - # name: reactos-msvc-amd64-${{github.sha}} - # path: build/bootcd.iso - # - name: Upload livecd - # uses: actions/upload-artifact@v1 - # with: - # name: reactos-msvc-amd64-${{github.sha}} - # path: build/livecd.iso + - name: Upload bootcd + uses: actions/upload-artifact@v2 + with: + name: reactos-msvc-amd64-${{github.sha}} + path: build/bootcd.iso + - name: Upload livecd + uses: actions/upload-artifact@v2 + with: + name: reactos-msvc-amd64-${{github.sha}} + path: build/livecd.iso
