Switch to Windows Server 2019

This might have been causing issues

Also, avoid path expansion on msys
next
Sayan Nandan 3 years ago
parent 3c14501913
commit bf3b62c077
No known key found for this signature in database
GPG Key ID: 8BC07A0A4D41DD52

@ -33,7 +33,7 @@ jobs:
os: macos-latest
artifact: x86_64-macos
- rust: x86_64-pc-windows-msvc
os: windows-latest
os: windows-2019
artifact: x86_64-windows
env:
RUST_BACKTRACE: 1
@ -79,12 +79,12 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-2019]
include:
- os: ubuntu-latest
rust: i686-unknown-linux-gnu
artifact: i686-linux-gnu
- os: windows-latest
- os: windows-2019
artifact: i686-windows
rust: i686-pc-windows-msvc

@ -20,7 +20,7 @@ jobs:
os: macos-latest
rust: stable
- build: windows-stable
os: windows-latest
os: windows-2019
rust: stable
steps:

@ -23,13 +23,13 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-latest, windows-2019]
include:
- os: ubuntu-latest
rust: x86_64-unknown-linux-gnu
- os: macos-latest
rust: x86_64-apple-darwin
- os: windows-latest
- os: windows-2019
rust: x86_64-pc-windows-msvc
steps:
@ -113,11 +113,11 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-latest, windows-2019]
include:
- os: ubuntu-latest
rust: i686-unknown-linux-gnu
- os: windows-latest
- os: windows-2019
rust: i686-pc-windows-msvc
steps:
- name: Checkout source code

@ -1,9 +1,8 @@
# although this is exported by cargo, we'll export it again to use it in the Makefile
export ROOT_DIR:=$(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
export MSYS_NO_PATHCONV:=1
SKYTEST_S1_FILE := $(ROOT_DIR)/ci/server1.toml
SKYTEST_S2_FILE := $(ROOT_DIR)/ci/server2.toml
SKYTEST_TLS_CERT := $(ROOT_DIR)/cert.pem
SKYTEST_TLS_KEY := $(ROOT_DIR)/key.pem
# no additional software note
NO_ADDITIONAL_SOFTWARE := echo "No additional software required for this target"
# target argument
@ -45,7 +44,7 @@ BINARY_SKYMIGRATE := $(TARGET_FOLDER)sky-migrate
# archive command
ARCHIVE :=
# start background server command
START_SERVER := $(CRUN) -p skyd -- --withconfig $(SKYTEST_S1_FILE)
START_SERVER := $(CRUN) -p skyd -- --withconfig "$(SKYTEST_S1_FILE)"
STOP_SERVER :=
ifeq ($(OS),Windows_NT)
@ -128,8 +127,8 @@ bundle: release-bundle
test: .pre
@${SEP}
@echo "Building and starting server in debug mode ..."
@${CBUILD} -p skyd
@chmod +x ci/ssl.sh && bash ci/ssl.sh
@${CBUILD} -p skyd
@mkdir -p server1 && cd server1 && ${START_SERVER}
@mkdir -p server2 && cd server2 && ${START_SERVER2}
@echo "Sleeping for 10 seconds to let the server start up ..."

@ -5,5 +5,5 @@ function gen_sub() {
esac
echo "$result"
}
openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj $(gen_sub '/C=US/CN=example.com') -keyout key.pem -out cert.pem
SUB=`gen_sub "/C=US/CN=foo"`
openssl req -new -newkey rsa:4096 -days 365 -nodes -x509 -subj $SUB -keyout key.pem -out cert.pem

Loading…
Cancel
Save