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.

Sign up for GitHub

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

Warnings removals and python 3.9 drop in tests #2860

Merged
merged 10 commits into from
Apr 26, 2024
Merged

Warnings removals and python 3.9 drop in tests #2860

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d089c1e
Update ci.yml
wpotrzebowski Apr 21, 2024
ac7dbb6
Update ci.yml
wpotrzebowski Apr 22, 2024
3429226
Update ci.yml
wpotrzebowski Apr 22, 2024
e7e5fd4
Update ci.yml
wpotrzebowski Apr 22, 2024
debd1ea
Update ci.yml
wpotrzebowski Apr 22, 2024
aa0f3a5
Merge branch 'release_6.0.0' into remove_warnings_from_gh_summary
wpotrzebowski Apr 24, 2024
386af7b
Update ci.yml
wpotrzebowski Apr 24, 2024
5d1b429
Update ci.yml
wpotrzebowski Apr 24, 2024
808b8c7
Update matrix.py
wpotrzebowski Apr 24, 2024
e67e4d4
Update matrix.py
wpotrzebowski Apr 26, 2024
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
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.9
python-version: 3.11

- uses: actions/checkout@v4
- id: set-matrix
Expand Down Expand Up @@ -232,7 +232,7 @@ jobs:

- name: Collect a debug tarball of the installer package
if: ${{ matrix.installer }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Debug-SasView-Installer-${{ matrix.os }}-${{ matrix.python-version }}
path: |
Expand Down Expand Up @@ -278,14 +278,14 @@ jobs:

- name: Publish installer package
if: ${{ matrix.installer }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: SasView-Installer-${{ matrix.os }}-${{ matrix.python-version }}
path: |
installers/dist/setupSasView.exe
installers/dist/SasView6.dmg
installers/dist/sasview6.tar.gz
if-no-files-found: error
if-no-files-found: ignore
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a good idea? Shouldn't the build be marked failed if the installer is not present?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, the problem with this one is that action only sees the current OS installer (e.g. Windows runner doesn't produce OSX installer). If one want to do it properly, we will probably have to split it into 3 actions and I considered doing that. However, the "error" only seems to throw the warning and it still proceeds the build. Therefore "ignoring" seems to be pragmatic solution here...


- name: Rename artifacts (Windows)
if: ${{ matrix.installer && startsWith(matrix.os, 'windows') }}
Expand All @@ -303,14 +303,15 @@ jobs:
mv installers/dist/sasview6.tar.gz installers/dist/SasView-6.0.0-alpha-Linux.tar.gz

- name: Upload Release Installer to GitHub
if: ${{ matrix.installer }}
uses: ncipollo/release-action@v1
with:
draft: false
prerelease: true
allowUpdates: true
replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "installers/dist/setupSasView-6.0.0-alpha-Win64.exe, installers/dist/SasView-6.0.0-alpha-MacOSX.dmg, installers/dist/SasView-6.0.0-alpha-Linux.tar.gz"
artifacts: "installers/dist/*SasView-6.0.0-*"
name: "Release 6.0.0-alpha"
bodyFile: "build_tools/release_notes/6.0.0_notes.txt"
tag: "v6.0.0-alpha"
Expand Down Expand Up @@ -354,7 +355,7 @@ jobs:

- name: Retrieve installer (workflow image)
if: ${{ env.INSTALLER_USE_OLD_IMAGE != 'true' }}
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: download
with:
name: SasView-Installer-${{ matrix.os }}-${{ matrix.python-version }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@

# List of python versions to use for tests
python_test_list = python_release_list + [
'3.9',
'3.10'
'3.10',
'3.11'
]


Expand Down
Loading