From 5148252fa32bfb29f1d19cc9f873f9cba8c25e41 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 17 Jun 2021 16:47:02 +0200 Subject: [PATCH] Test dev --- .circleci/config.yml | 2 +- appveyor.yml | 100 +++++++++++++++++++++---------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ccbb5230..eeaddee3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -112,7 +112,7 @@ jobs: cd ~ if ! [ -d graalvm-ce-java11-21.1.0 ]; then curl -O -sL https://github.com/graalvm/graalvm-ce-dev-builds/releases/download/21.2.0-dev-20210616_2034/graalvm-ce-java11-linux-amd64-dev.tar.gz - tar xzf graalvm-ce-java11-linux-amd64-21.1.0.tar.gz + tar xzf graalvm-ce-java11-linux-amd64-21.2.0-dev.tar.gz fi - run: name: Build binary diff --git a/appveyor.yml b/appveyor.yml index b5e535ed..3b9a7c05 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,74 +1,74 @@ ---- +# --- -version: "v-{build}" +# version: "v-{build}" -image: Visual Studio 2017 +# image: Visual Studio 2017 -clone_folder: C:\projects\babashka +# clone_folder: C:\projects\babashka -environment: - GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.1.0 - JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.1.0 - BABASHKA_XMX: "-J-Xmx5g" +# environment: +# GRAALVM_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.1.0 +# JAVA_HOME: C:\projects\babashka\graalvm\graalvm-ce-java11-21.1.0 +# BABASHKA_XMX: "-J-Xmx5g" -cache: - - C:\ProgramData\chocolatey\lib -> project.clj, appveyor.yml - - '%USERPROFILE%\.m2 -> project.clj' - - 'graalvm -> appveyor.yml' +# cache: +# - C:\ProgramData\chocolatey\lib -> project.clj, appveyor.yml +# - '%USERPROFILE%\.m2 -> project.clj' +# - 'graalvm -> appveyor.yml' -clone_script: -- ps: >- - if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER) { - git clone -q --branch=$env:APPVEYOR_REPO_BRANCH https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER - cd $env:APPVEYOR_BUILD_FOLDER - git checkout -qf $env:APPVEYOR_REPO_COMMIT - } else { - git clone -q https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER - cd $env:APPVEYOR_BUILD_FOLDER - git fetch -q origin +refs/pull/$env:APPVEYOR_PULL_REQUEST_NUMBER/merge: - git checkout -qf FETCH_HEAD - } -- cmd: git submodule update --init --recursive +# clone_script: +# - ps: >- +# if(-not $env:APPVEYOR_PULL_REQUEST_NUMBER) { +# git clone -q --branch=$env:APPVEYOR_REPO_BRANCH https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER +# cd $env:APPVEYOR_BUILD_FOLDER +# git checkout -qf $env:APPVEYOR_REPO_COMMIT +# } else { +# git clone -q https://github.com/$env:APPVEYOR_REPO_NAME.git $env:APPVEYOR_BUILD_FOLDER +# cd $env:APPVEYOR_BUILD_FOLDER +# git fetch -q origin +refs/pull/$env:APPVEYOR_PULL_REQUEST_NUMBER/merge: +# git checkout -qf FETCH_HEAD +# } +# - cmd: git submodule update --init --recursive -build_script: -- cmd: >- - powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-windows-amd64-21.1.0.zip', 'graalvm.zip') }" +# build_script: +# - cmd: >- +# powershell -Command "if (Test-Path('graalvm')) { return } else { (New-Object Net.WebClient).DownloadFile('https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-21.1.0/graalvm-ce-java11-windows-amd64-21.1.0.zip', 'graalvm.zip') }" - powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" +# powershell -Command "if (Test-Path('graalvm')) { return } else { Expand-Archive graalvm.zip graalvm }" -- cmd: >- - powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat', 'lein.bat')" +# - cmd: >- +# powershell -Command "(New-Object Net.WebClient).DownloadFile('https://raw.githubusercontent.com/technomancy/leiningen/stable/bin/lein.bat', 'lein.bat')" - call lein self-install +# call lein self-install -- cmd: >- - set BABASHKA_TEST_ENV=jvm +# - cmd: >- +# set BABASHKA_TEST_ENV=jvm - call script/test.bat +# call script/test.bat -# see https://github.com/quarkusio/quarkus/pull/7663 +# # see https://github.com/quarkusio/quarkus/pull/7663 -- cmd: >- - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" +# - cmd: >- +# call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" - call script/uberjar.bat +# call script/uberjar.bat - call script/compile.bat +# call script/compile.bat - echo Creating zip archive +# echo Creating zip archive - set zip=babashka-%BABASHKA_VERSION%-windows-amd64.zip +# set zip=babashka-%BABASHKA_VERSION%-windows-amd64.zip - jar -cMf %zip% bb.exe +# jar -cMf %zip% bb.exe - set BABASHKA_EDN=.build/bb.edn +# set BABASHKA_EDN=.build/bb.edn - bb release-artifact %zip% +# bb release-artifact %zip% - set BABASHKA_TEST_ENV=native +# set BABASHKA_TEST_ENV=native - call script/test.bat +# call script/test.bat -artifacts: -- path: babashka-*-windows-amd64.zip - name: babashka +# artifacts: +# - path: babashka-*-windows-amd64.zip +# name: babashka