diff --git a/.github/workflows/releaseDeploy.yml b/.github/workflows/releaseDeploy.yml index 96c4a513f..d823012b6 100644 --- a/.github/workflows/releaseDeploy.yml +++ b/.github/workflows/releaseDeploy.yml @@ -21,7 +21,7 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Update all submodules run: | @@ -72,55 +72,49 @@ jobs: - name: Upload build artifact (Windows) if: matrix.os == 'windows-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact-name }} path: ${{github.workspace}}/build/RAYX-*-win64.zip - + if-no-files-found: error + - name: Upload build artifact (Ubuntu) if: matrix.os == 'ubuntu-latest' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.artifact-name }} path: ${{github.workspace}}/build/RAYX-*-Linux.deb + if-no-files-found: error - create-release: + release: + name: Create Release needs: build-and-release runs-on: ubuntu-latest steps: + # Checkout CHANGELOG.md + - name: Checkout code + uses: actions/checkout@v4 + with: + sparse-checkout: CHANGELOG.md + - name: Download Artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: ${{github.workspace}}/artifacts - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Extract version from tag + id: get_version + run: echo "version=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV + + - name: Create and Upload Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: - tag_name: ${{ github.ref_name }} - release_name: Release ${{ github.ref_name }} - body: This will be updated soon... - draft: false - prerelease: false - - - name: Upload Artifact to Release (Windows) - uses: actions/upload-release-asset@v1 + body_path: ${{github.workspace}}/CHANGELOG.md + files: | + ${{github.workspace}}/artifacts/rayx-win64.zip/*.zip + ${{github.workspace}}/artifacts/rayx-Linux.deb/*.deb env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{github.workspace}}/artifacts/rayx-win64.zip/rayx-win64.zip - asset_name: rayx-win64.zip - asset_content_type: application/zip - - name: Upload Artifact to Release (Ubuntu) - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ${{github.workspace}}/artifacts/rayx-Linux.deb/rayx-Linux.deb - asset_name: rayx-Linux.deb - asset_content_type: application/x-deb \ No newline at end of file + diff --git a/.github/workflows/testUbuntu.yml b/.github/workflows/testUbuntu.yml index 5d617c937..85c9ff13a 100644 --- a/.github/workflows/testUbuntu.yml +++ b/.github/workflows/testUbuntu.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update all submodules run: | @@ -47,7 +47,7 @@ jobs: run: cpack -G DEB - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: RAYX path: ${{github.workspace}}/build/RAYX-*.*.*-Linux.deb diff --git a/.github/workflows/testWindows.yml b/.github/workflows/testWindows.yml index 141610ae2..d44797bad 100644 --- a/.github/workflows/testWindows.yml +++ b/.github/workflows/testWindows.yml @@ -14,7 +14,7 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Update all submodules run: | @@ -49,7 +49,7 @@ jobs: cpack -G ZIP - name: Upload artifact - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: RAYX path: ${{github.workspace}}/build/RAYX-*.*.*-win64.zip diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..485cd9972 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,26 @@ +# Changes + +- rayx-core: + - Added optical elements + - Paraboloid + - Added light sources + - Simple Undulator + - Pixel Source + - Dipole Source + - Improved code consistency for optical elements and light sources + - Improved test suite + - Fixes for RZP tracing +- rayx: + - Added more options to customize the export of rays and speed up the tracing + - Added option to choose GPU + - Improved runtime by optimizing data handling +- rayx-ui: + - Added orthographic camera + - Added footprints/heatmaps/histograms for simple optical elements + - Changed default camera position and orientation + - Jump to light source is possible now + - Correctly render slits + - Fixed positioning of light sources + - Fixed triangulation bugs + - Fixed general rendering bugs +- General bugfixes and documentation updates \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ee8ff1ab..baa53e931 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.15 FATAL_ERROR) # ---- Project ---- -project(RAYX VERSION 0.19.3) +project(RAYX VERSION 0.19.0) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) # -----------------