Skip to content

Commit

Permalink
Fix actions (#208)
Browse files Browse the repository at this point in the history
Fixed actions
  • Loading branch information
dpilger26 authored Dec 18, 2023
1 parent f4e25b9 commit 5e40aab
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/actions/BuildTestInstall/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ runs:

- name: Build
shell: ${{inputs.shell}}
run: cmake --build ${{github.workspace}}/build --config Release -j8
run: cmake --build ${{github.workspace}}/build --config Release -j88

- name: pytest
shell: ${{inputs.shell}}
Expand Down
14 changes: 8 additions & 6 deletions .github/actions/LinuxEnvironmentSetup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@ runs:
using: "composite"
steps:
- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: false
miniconda-version: "latest"
activate-environment: test
environment-file: test/pytest/environment.yml
python-version: 3.9

- name: Activate Env
shell: bash -l {0}
Expand All @@ -22,5 +20,9 @@ runs:
shell: bash -l {0}
run: |
sudo apt update
sudo apt install -y libboost-all-dev
sudo apt install -y clang --install-suggests
sudo apt install -y build-essential lsb-release wget software-properties-common gnupg libboost-all-dev
wget https://apt.llvm.org/llvm.sh
chmod u+x llvm.sh
sed -i 's/add-apt-repository "${REPO_NAME}"/add-apt-repository -y "${REPO_NAME}"/g' llvm.sh
sudo ./llvm.sh 16
sudo ln -sfn /usr/bin/clang++-16 /usr/bin/clang++
6 changes: 2 additions & 4 deletions .github/actions/WindowsEnvironmentSetup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,11 @@ runs:
using: "composite"
steps:
- name: Setup conda
uses: conda-incubator/setup-miniconda@v2
uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
auto-activate-base: false
miniconda-version: "latest"
activate-environment: test
environment-file: test/pytest/environment.yml
python-version: 3.9

- name: Activate Env
shell: powershell
Expand Down
2 changes: 1 addition & 1 deletion test/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
if(BUILD_TESTS)
message(STATUS "Configuring Unit Tests")
add_subdirectory(gtest)
# add_subdirectory(gtest)
add_subdirectory(pytest)
endif()

Expand Down
2 changes: 1 addition & 1 deletion test/pytest/environment.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: test
dependencies:
- python=3.9
- python=3.10
- pip
- numpy
- astropy
Expand Down
2 changes: 1 addition & 1 deletion test/pytest/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ target_include_directories(${TARGET_NAME} PRIVATE
)

set(Python_USE_STATIC_LIBS True)
find_package(Python 3.8 REQUIRED
find_package(Python 3.10 REQUIRED
COMPONENTS
Development.Module
)
Expand Down

0 comments on commit 5e40aab

Please sign in to comment.