Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI Fixes #194

Merged
merged 4 commits into from
Oct 13, 2020
Merged

CI Fixes #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
65c5c5c
Update azure-jobs.yml
fundies Oct 12, 2020
e017175
Update azure-jobs.yml
fundies Oct 12, 2020
1f0ed87
Update azure-jobs.yml
fundies Oct 12, 2020
b5bde68
Update azure-vars.yml
fundies Oct 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 11 additions & 26 deletions azure-jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,46 +54,31 @@ jobs:
git checkout --progress --force enigmaref
displayName: Checkout ENIGMA Reference

- script: |
git clone https://github.com/msys2/msys2-ci-base.git %CD:~0,2%\msys64
%CD:~0,2%\msys64\usr\bin\rm -rf %CD:~0,2%\msys64\.git
- powershell: |
choco install msys2
displayName: Install MSYS2

- script: |
set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
%CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
%CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
%CD:~0,2%\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig
%CD:~0,2%\msys64\usr\bin\pacman --overwrite='*' --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz
%CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
displayName: Update MSYS2

- script: taskkill /f /fi "MODULES eq msys-2.0.dll" || exit /b 0s
displayName: Reset MSYS2

- script: |
set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
%CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu
%CD:~0,2%\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
%CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Scc
set PATH=C:\tools\msys64\usr\bin
C:\tools\msys64\usr\bin\pacman --noconfirm -Syyuu
C:\tools\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla
C:\tools\msys64\usr\bin\pacman --noconfirm -Scc
displayName: Install Toolchain

- script: |
set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
%CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
set PATH=C:\tools\msys64\usr\bin
cd $(Agent.BuildDirectory)/RadialGM/
%CD:~0,2%\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
C:\tools\msys64\usr\bin\bash -lc "bash ci-build.sh MinSizeRel $(PWD)/cmake-package"
displayName: 'Release Build'
env:
MSYSTEM: $(MINGW_UPPER)
CHERE_INVOKING: yes
MINGW_INSTALLS: $(MINGW_LOWER)

- script: |
set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem
%CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf
set PATH=C:\tools\msys64\usr\bin
cd $(Agent.BuildDirectory)/RadialGM/
%CD:~0,2%\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
C:\tools\msys64\usr\bin\bash -lc "bash ci-build.sh Debug $(PWD)/cmake-package"
displayName: 'Debug Build'
env:
MSYSTEM: $(MINGW_UPPER)
Expand Down Expand Up @@ -136,7 +121,7 @@ jobs:
dependsOn: CreateReleaseCandidate
pool:
vmImage: 'windows-latest'
timeoutInMinutes: 250
timeoutInMinutes: 360

steps:
- checkout: ${{ parameters.repo }}
Expand Down
2 changes: 1 addition & 1 deletion azure-vars.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
variables:
vcpkgGitRef: 7960648b4d922888e7a5c2a4c3ae9e153eab0374 # Update this git ref to update vcpkg
vcpkgGitRef: 16b68c2f35771c250b354248f11015f9def2a89b # Update this git ref to update vcpkg
releasetag: 'RadialGM-$(Build.SourceVersion)'