Skip to content
Closed
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
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-QT5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
os: [ubuntu-24.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- run: sudo apt update
- run: sudo apt install -y apt-utils build-essential wget qt5-qmake qt5-qmake-bin qt5-assistant qtbase5-dev qtmultimedia5-dev libqt5charts5 libqt5charts5-dev libqt5multimedia* libqt5datavisualization5-dev libqt5datavisualization5 libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev
- run: qmake DFTFringe_QT5.pro
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-clazy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
os: [ubuntu-24.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- run: |
sudo apt update
sudo apt install -y clazy apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
os: [ubuntu-24.04, ubuntu-22.04]
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v6
- run: sudo apt update
- run: sudo apt install -y apt-utils build-essential wget qt6-base-dev-tools qt6-declarative-dev qt6-multimedia-dev libqt6charts6-dev libqt6datavisualization6-dev libqt6svg6-dev libopencv-core-dev libopencv-dev libqwt-qt5-6 libqwt-qt5-dev libarmadillo-dev libgl1-mesa-dev libglu1-mesa-dev bear
- run: wget -O qwt-${{env.QWT_version}}.zip https://sourceforge.net/projects/qwt/files/qwt/${{env.QWT_version}}/qwt-${{env.QWT_version}}.zip/download?use_mirror=pilotfiber
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/build-windows-QT5.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
# this will restore/cache everything in /Tools depending on cache hit/miss
- name: Cache minGW
id: cache-minGW
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: Tools
key: ${{ runner.os }}-mingw${{env.mingw_version}}_64

# all what follows is only run on cache miss
- name: install newer python
if: steps.cache-minGW.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: install aqtinstall tool
Expand All @@ -52,7 +52,7 @@ jobs:
steps:
# this will restore/cache everything depending on cache hit/miss
- name: Cache QT and openCV
uses: actions/cache/@v4
uses: actions/cache@v6
id: cache-openCV-QT
with:
path: |
Expand All @@ -69,7 +69,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -78,7 +78,7 @@ jobs:
fail-on-cache-miss: true
- name: install newer python
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: add minGW to path
Expand All @@ -91,7 +91,7 @@ jobs:
- name: install QT
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
run: aqt install-qt windows desktop ${{env.QT_version}} win64_mingw81 -m qtcharts qtdatavis3d
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
with:
repository: 'opencv/opencv'
Expand All @@ -116,7 +116,7 @@ jobs:
steps:
# this will restore/cache everything depending on cache hit/miss
- name: cache QWT
uses: actions/cache/@v4
uses: actions/cache@v6
id: cache-QWT
with:
path: |
Expand All @@ -127,7 +127,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-QWT.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -150,7 +150,7 @@ jobs:
run: 7z x qwt-${{env.QWT_version}}.zip
- name: install newer python
if: steps.cache-QWT.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: install aqtinstall tool
Expand All @@ -173,7 +173,7 @@ jobs:
# this will restore/cache everything depending on cache hit/miss
- name: Cache lapack build
id: cache-lapack
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
build_lapack\bin\liblapack.dll
Expand All @@ -184,7 +184,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-lapack.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -195,7 +195,7 @@ jobs:
if: steps.cache-lapack.outputs.cache-hit != 'true'
shell: bash
run: echo "${{github.workspace}}\Tools\mingw${{env.mingw_version}}_64\bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: steps.cache-lapack.outputs.cache-hit != 'true'
with:
repository: 'Reference-LAPACK/lapack'
Expand Down Expand Up @@ -241,7 +241,7 @@ jobs:
# Match will be done in build folder, and file at root will be used to link the match
# Note checkouting twice is not working.
# This copy is done before adding any more file into folders
- uses: actions/checkout@v4
- uses: actions/checkout@v6
# with:
# path: 'DFTFringe'

Expand All @@ -253,7 +253,7 @@ jobs:


# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-minGW
with:
path: Tools
Expand All @@ -263,7 +263,7 @@ jobs:
shell: bash
run: echo "${{github.workspace}}\Tools\mingw${{env.mingw_version}}_64\bin" >> $GITHUB_PATH
# restore cached lapack and armadillo
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-lapack
with:
path: |
Expand All @@ -273,7 +273,7 @@ jobs:
key: ${{ runner.os }}-lapack-${{env.lapack_version}}-armadillo-${{env.armadillo_version}}
fail-on-cache-miss: true
# restore cached QWT
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-QWT
with:
path: |
Expand All @@ -282,7 +282,7 @@ jobs:
key: ${{ runner.os }}-QWT-${{env.QWT_version}}
fail-on-cache-miss: true
# restore cached openCV and QT
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-openCV-QT
with:
path: |
Expand Down Expand Up @@ -369,7 +369,7 @@ jobs:
run: Tools\QtInstallerFramework\4.7\bin\binarycreator.exe -c DFTFringe\DFTFringeInstaller\config\config.xml -p DFTFringe\DFTFringeInstaller\packages DFTFringeInstaller_QT5_${{env.WORKFLOW_VERSION}}

- name: Upload Artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: DFTFringe-windows-build-artifact-QT5
path: |
Expand Down
38 changes: 19 additions & 19 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ jobs:
# this will restore/cache everything in /Tools depending on cache hit/miss
- name: Cache minGW
id: cache-minGW
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: Tools
key: ${{ runner.os }}-mingw${{env.mingw_version}}_64

# all what follows is only run on cache miss
- name: install newer python
if: steps.cache-minGW.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: install aqtinstall tool
Expand All @@ -52,7 +52,7 @@ jobs:
steps:
# this will restore/cache everything depending on cache hit/miss
- name: Cache QT and openCV
uses: actions/cache/@v4
uses: actions/cache@v6
id: cache-openCV-QT
with:
path: |
Expand All @@ -71,7 +71,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -80,7 +80,7 @@ jobs:
fail-on-cache-miss: true
- name: install newer python
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: add minGW to path
Expand All @@ -93,7 +93,7 @@ jobs:
- name: install QT
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
run: aqt install-qt windows desktop ${{env.QT_version}} win64_mingw -m qtcharts qtdatavis3d
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: steps.cache-openCV-QT.outputs.cache-hit != 'true'
with:
repository: 'opencv/opencv'
Expand All @@ -118,7 +118,7 @@ jobs:
steps:
# this will restore/cache everything depending on cache hit/miss
- name: cache QWT
uses: actions/cache/@v4
uses: actions/cache@v6
id: cache-QWT
with:
path: |
Expand All @@ -129,7 +129,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-QWT.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -152,7 +152,7 @@ jobs:
run: 7z x qwt-${{env.QWT_version}}.zip
- name: install newer python
if: steps.cache-QWT.outputs.cache-hit != 'true'
uses: actions/setup-python@v5
uses: actions/setup-python@v7
with:
python-version: ${{env.python_version}}
- name: install aqtinstall tool
Expand All @@ -175,7 +175,7 @@ jobs:
# this will restore/cache everything depending on cache hit/miss
- name: Cache lapack build
id: cache-lapack
uses: actions/cache@v4
uses: actions/cache@v6
with:
path: |
build_lapack\bin\liblapack.dll
Expand All @@ -186,7 +186,7 @@ jobs:
# all what follows is only run on cache miss

# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
if: steps.cache-lapack.outputs.cache-hit != 'true'
id: cache-minGW
with:
Expand All @@ -197,7 +197,7 @@ jobs:
if: steps.cache-lapack.outputs.cache-hit != 'true'
shell: bash
run: echo "${{github.workspace}}\Tools\mingw${{env.mingw_version}}_64\bin" >> $GITHUB_PATH
- uses: actions/checkout@v4
- uses: actions/checkout@v6
if: steps.cache-lapack.outputs.cache-hit != 'true'
with:
repository: 'Reference-LAPACK/lapack'
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:
# Match will be done in build folder, and file at root will be used to link the match
# Note checkouting twice is not working.
# This copy is done before adding any more file into folders
- uses: actions/checkout@v4
- uses: actions/checkout@v6
# with:
# path: 'DFTFringe'

Expand All @@ -254,7 +254,7 @@ jobs:


# restore cached minGW
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-minGW
with:
path: Tools
Expand All @@ -264,7 +264,7 @@ jobs:
shell: bash
run: echo "${{github.workspace}}\Tools\mingw${{env.mingw_version}}_64\bin" >> $GITHUB_PATH
# restore cached lapack and armadillo
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-lapack
with:
path: |
Expand All @@ -274,7 +274,7 @@ jobs:
key: ${{ runner.os }}-lapack-${{env.lapack_version}}-armadillo-${{env.armadillo_version}}-mingw${{env.mingw_version}}
fail-on-cache-miss: true
# restore cached QWT
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-QWT
with:
path: |
Expand All @@ -283,7 +283,7 @@ jobs:
key: ${{ runner.os }}-QWT-${{env.QWT_version}}-mingw${{env.mingw_version}}
fail-on-cache-miss: true
# restore cached openCV and QT
- uses: actions/cache/restore@v4
- uses: actions/cache/restore@v6
id: cache-openCV-QT
with:
path: |
Expand Down Expand Up @@ -378,7 +378,7 @@ jobs:

- name: Upload Artifact
id: upload_artifact
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v7
with:
name: DFTFringe-windows-build-artifact
path: |
Expand All @@ -394,7 +394,7 @@ jobs:

- name: Comment PR with artifact link
if: github.event_name == 'pull_request'
uses: peter-evans/create-or-update-comment@v4
uses: peter-evans/create-or-update-comment@v5
with:
token: ${{ secrets.GITHUB_TOKEN }}
issue-number: ${{ github.event.pull_request.number }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/make-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@ jobs:
needs: call-build-windows
steps:
# get artifact uploaded from build workflow
- uses: actions/download-artifact@v4
- uses: actions/download-artifact@v8
with:
name: DFTFringe-windows-build-artifact
# create the GitHub release and upload the artifacts
- name: publish Release
uses: softprops/action-gh-release@v1
uses: softprops/action-gh-release@v3
with:
body: |
- edit this changelog
Expand Down
Loading