Remove non-working windows job for now [ci skip]
This commit is contained in:
parent
059dabcb6a
commit
8c65b43b88
2 changed files with 6 additions and 44 deletions
38
.github/workflows/ci-main.yml
vendored
38
.github/workflows/ci-main.yml
vendored
|
@ -328,41 +328,3 @@ jobs:
|
|||
export CFG=Debug
|
||||
export CACHE_DIR=~/build-cache
|
||||
./.github/workflows/ci-scripts/macos.sh
|
||||
|
||||
windows-01-master:
|
||||
runs-on: windows-2019
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
with:
|
||||
submodules: "recursive"
|
||||
|
||||
- name: Cache object files
|
||||
uses: actions/cache@v2
|
||||
env:
|
||||
cache-name: windows-01-cache-master
|
||||
with:
|
||||
path: ~/build-cache
|
||||
key: windows-01-master
|
||||
|
||||
- uses: Vampire/setup-wsl@v1
|
||||
with:
|
||||
distribution: Ubuntu-20.04
|
||||
|
||||
- name: Choco installing
|
||||
shell: cmd
|
||||
run: choco.exe install sqlite
|
||||
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v1.0.2
|
||||
|
||||
- name: Windows Release
|
||||
shell: wsl-bash {0}
|
||||
run: |
|
||||
export CFG=Release
|
||||
export CACHE_DIR=~/build-cache
|
||||
export PATH="/mnt/c/ProgramData/chocolatey/lib/SQLite/tools/sqlite-tools-win32-x86-3330000:$PATH"
|
||||
sudo apt update
|
||||
sudo apt install dos2unix
|
||||
dos2unix .github/workflows/ci-scripts/windows.sh
|
||||
./.github/workflows/ci-scripts/windows.sh
|
||||
|
|
12
.travis.yml
12
.travis.yml
|
@ -36,10 +36,10 @@ jobs:
|
|||
# compiler: clang
|
||||
# env: TOOL=xcodebuild NLS=true CFG=Debug BRANCH=master UPLOAD=true
|
||||
|
||||
- os: osx
|
||||
osx_image: xcode11.3
|
||||
compiler: clang
|
||||
env: TOOL=xcodebuild NLS=true CFG=Release BRANCH=master
|
||||
# - os: osx
|
||||
# osx_image: xcode11.3
|
||||
# compiler: clang
|
||||
# env: TOOL=xcodebuild NLS=true CFG=Release BRANCH=master
|
||||
|
||||
# - compiler: gcc
|
||||
# env: TOOL=scons CXXSTD=14 NLS=only IMAGE=2004 BRANCH=master CFG=release
|
||||
|
@ -50,8 +50,8 @@ jobs:
|
|||
|
||||
# - env: TOOL=scons NLS=true IMAGE=flatpak BRANCH=master
|
||||
|
||||
- compiler: gcc
|
||||
env: TOOL=scons CXXSTD=17 NLS=false IMAGE=2004 BRANCH=master CFG=release VALIDATE=true LTO=true
|
||||
# - compiler: gcc
|
||||
# env: TOOL=scons CXXSTD=17 NLS=false IMAGE=2004 BRANCH=master CFG=release VALIDATE=true LTO=true
|
||||
|
||||
# - compiler: gcc
|
||||
# env: TOOL=scons CXXSTD=14 NLS=false IMAGE=2004 BRANCH=master CFG=debug UPLOAD=true
|
||||
|
|
Loading…
Add table
Reference in a new issue