Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
# Conflicts:
#	core/include/gdx/maskedraster.h
  • Loading branch information
dirkvdb committed Dec 18, 2023
2 parents e581d1e + 50d7946 commit 99371c1
Show file tree
Hide file tree
Showing 69 changed files with 1,716 additions and 3,451 deletions.
9 changes: 2 additions & 7 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
---
# BasedOnStyle: LLVM
AccessModifierOffset: -4
ConstructorInitializerIndentWidth: 0
AlignAfterOpenBracket: DontAlign
AlignAfterOpenBracket: Align
AlignEscapedNewlines: Left
AlignOperands: true
AlignTrailingComments: true
AlignConsecutiveAssignments : true
AlignConsecutiveDeclarations : false
AllowAllParametersOfDeclarationOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortIfStatementsOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: true
AllowShortLoopsOnASingleLine: false
Expand Down Expand Up @@ -64,10 +63,6 @@ IndentWidth: 4
TabWidth: 4
UseTab: Never
IndentFunctionDeclarationAfterType: false
SpacesInParentheses: false
SpacesInAngles: false
SpaceInEmptyParentheses: false
SpacesInCStyleCastParentheses: false
SpaceAfterControlStatementKeyword: true
SpaceBeforeAssignmentOperators: true
SortIncludes: true
Expand Down
74 changes: 0 additions & 74 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

18 changes: 11 additions & 7 deletions .github/workflows/conda-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,26 @@ jobs:
strategy:
fail-fast: false
matrix:
os: ["ubuntu-latest", "windows-latest"]
os: ["ubuntu-latest", "windows-2022"]
steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true
- uses: conda-incubator/setup-miniconda@v2
- uses: conda-incubator/setup-miniconda@v3
with:
auto-update-conda: true
activate-environment: build
python-version: 3.8
python-version: "3.10"
- name: create meta.yaml
run: python
- name: Install build requirement
run: conda install conda-build jinja2
- name: Setup conda forge
run: |
conda config --add channels conda-forge
conda config --set channel_priority strict
- name: Install build requirements
run: conda install mamba boa jinja2
- name: Generate package metadata
run: python ./conda/metagen.py
- name: Build conda package
run: conda build ./conda
run: conda mambabuild ./conda
45 changes: 45 additions & 0 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Publish Release
on:
push:
tags:
- "v*"

jobs:
build:
name: Build source archive
runs-on: ubuntu-latest
steps:
- name: Install osx dependencies
if: ${{ matrix.cfg.os == 'macos-latest' }}
run: brew install nasm ninja
- name: Cache vcpkg binary
id: cache-vcpkg-bin
uses: actions/cache@v2
with:
path: |
deps/vcpkg/vcpkg
deps/vcpkg/vcpkg.exe
key: ${{ runner.os }}-${{ hashFiles('deps/vcpkg/bootstrap.cmake') }}
- name: Cache vcpkg packages
id: cache-vcpkg
uses: actions/cache@v2
with:
path: |
~/.cache/vcpkg
~/AppData/Local/vcpkg/archives
key: ${{ runner.os }}-${{ matrix.cfg.triplet }}-${{ hashFiles('vcpkg.json', '.git/modules/deps/vcpkg/shallow') }}
- name: Bootstrap the ports
run: python bootstrap.py --triplet ${{ matrix.cfg.triplet }} --clean-after-build
- name: Build the code
run: python build.py --dist --triplet ${{ matrix.cfg.triplet }} --no-avx2 --run-tests
release:
name: Publish the release
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- uses: ncipollo/release-action@v1
with:
artifacts: "build/x64-linux/geodynamix-*.*"
artifactErrorsFailBuild: true
token: ${{ secrets.GITHUB_TOKEN }}
8 changes: 4 additions & 4 deletions .github/workflows/vcpkg-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ jobs:

steps:
- name: Clone repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
submodules: true
- name: Set up Python
uses: actions/setup-python@main
uses: actions/setup-python@v4
id: setup-python
with:
python-version: "3.x"
Expand All @@ -36,15 +36,15 @@ jobs:
run: brew install nasm ninja
- name: Cache vcpkg binary
id: cache-vcpkg-bin
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
deps/vcpkg/vcpkg
deps/vcpkg/vcpkg.exe
key: ${{ runner.os }}-${{ hashFiles('deps/vcpkg/bootstrap.cmake') }}
- name: Cache vcpkg packages
id: cache-vcpkg
uses: actions/cache@v2
uses: actions/cache@v3
with:
path: |
~/.cache/vcpkg
Expand Down
Loading

0 comments on commit 99371c1

Please sign in to comment.