Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GITHUB] Enable amd64 artefacts and other minor changes

Browse source 
- 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
This commit is contained in:
Victor Perevertkin 2020-11-09 00:08:18 +03:00
parent b8525ce7a5
commit 05a5edef12
No known key found for this signature in database
GPG key ID: C750B7222E9C7830
1 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
.github/workflows/build.yml vendored
View file

@ -17,7 +17,7 @@ jobs:
with: with:
path: src path: src
- name: Set up cache for ccache - name: Set up cache for ccache
uses: actions/cache@v1 uses: actions/cache@v2
with: with:
path: ccache path: ccache
key: ccache-gcc-i386-${{github.sha}} key: ccache-gcc-i386-${{github.sha}}
@ -25,10 +25,10 @@ jobs:
ccache-gcc-i386- ccache-gcc-i386-
- name: Set ccache settings - name: Set ccache settings
run: | run: |
echo "::set-env name=CCACHE_BASEDIR::${{github.workspace}}" echo "CCACHE_BASEDIR=${{github.workspace}}" >> $GITHUB_ENV
echo "::set-env name=CCACHE_DIR::${{github.workspace}}/ccache" echo "CCACHE_DIR=${{github.workspace}}/ccache" >> $GITHUB_ENV
echo "::set-env name=CCACHE_MAXSIZE::1G" echo "CCACHE_MAXSIZE=1G" >> $GITHUB_ENV
echo "::set-env name=CCACHE_SLOPPINESS::time_macros" echo "CCACHE_SLOPPINESS=time_macros" >> $GITHUB_ENV
- name: Configure - name: Configure
run: | run: |
mkdir build mkdir build
@ -45,12 +45,12 @@ jobs:
- name: Print ccache statistics - name: Print ccache statistics
run: ccache -s run: ccache -s
- name: Upload bootcd - name: Upload bootcd
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
with: with:
name: reactos-gcc-i386-${{github.sha}} name: reactos-gcc-i386-${{github.sha}}
path: build/bootcd.iso path: build/bootcd.iso
- name: Upload livecd - name: Upload livecd
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
with: with:
name: reactos-gcc-i386-${{github.sha}} name: reactos-gcc-i386-${{github.sha}}
path: build/livecd.iso path: build/livecd.iso
@ -65,9 +65,9 @@ jobs:
run: | run: |
curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
7z x flexbison.7z -O${{github.workspace}}\bin 7z x flexbison.7z -O${{github.workspace}}\bin
echo "::add-path::${{github.workspace}}\bin" echo "${{github.workspace}}\bin" >> $GITHUB_PATH
echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV
echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV
- name: Add CL to PATH - name: Add CL to PATH
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
with: with:
@ -100,9 +100,9 @@ jobs:
run: | run: |
curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
7z x flexbison.7z -O${{github.workspace}}\bin 7z x flexbison.7z -O${{github.workspace}}\bin
echo "::add-path::${{github.workspace}}\bin" echo "${{github.workspace}}\bin" >> $GITHUB_PATH
echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV
echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV
- name: Add CL to PATH - name: Add CL to PATH
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
with: with:
@ -124,12 +124,12 @@ jobs:
cmake --build . --target bootcd cmake --build . --target bootcd
cmake --build . --target livecd cmake --build . --target livecd
- name: Upload bootcd - name: Upload bootcd
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
with: with:
name: reactos-msvc-i386-${{github.sha}} name: reactos-msvc-i386-${{github.sha}}
path: build/bootcd.iso path: build/bootcd.iso
- name: Upload livecd - name: Upload livecd
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
with: with:
name: reactos-msvc-i386-${{github.sha}} name: reactos-msvc-i386-${{github.sha}}
path: build/livecd.iso path: build/livecd.iso
@ -144,9 +144,9 @@ jobs:
run: | run: |
curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z curl -O https://svn.reactos.org/storage/vperevertkin/flexbison.7z
7z x flexbison.7z -O${{github.workspace}}\bin 7z x flexbison.7z -O${{github.workspace}}\bin
echo "::add-path::${{github.workspace}}\bin" echo "${{github.workspace}}\bin" >> $GITHUB_PATH
echo "::set-env name=BISON_PKGDATADIR::${{github.workspace}}\bin\share\bison" echo "BISON_PKGDATADIR=${{github.workspace}}\bin\share\bison" >> $GITHUB_ENV
echo "::set-env name=M4::${{github.workspace}}\bin\m4.exe" echo "M4=${{github.workspace}}\bin\m4.exe" >> $GITHUB_ENV
- name: Add CL to PATH - name: Add CL to PATH
uses: ilammy/msvc-dev-cmd@v1 uses: ilammy/msvc-dev-cmd@v1
with: with:
@ -168,13 +168,13 @@ jobs:
run: | run: |
cmake --build . --target bootcd cmake --build . --target bootcd
cmake --build . --target livecd cmake --build . --target livecd
# - name: Upload bootcd - name: Upload bootcd
# uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
# with: with:
# name: reactos-msvc-amd64-${{github.sha}} name: reactos-msvc-amd64-${{github.sha}}
# path: build/bootcd.iso path: build/bootcd.iso
# - name: Upload livecd - name: Upload livecd
# uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v2
# with: with:
# name: reactos-msvc-amd64-${{github.sha}} name: reactos-msvc-amd64-${{github.sha}}
# path: build/livecd.iso path: build/livecd.iso