Skip to content

Commit

Permalink
Simplify build script to try code signing
Browse files Browse the repository at this point in the history 
* MACOS_CERTIFICATE_ENCODED (.p12 content base64 encoded) updated on github
* MACOS_CERTIFICATE_PASSWORD (.p12 password) updated on github
  • Loading branch information
@AndrewSazonov
AndrewSazonov committed Jun 13, 2024
1 parent 2bd1726 commit 5bb8820
Showing 1 changed file with 3 additions and 229 deletions.
232 changes: 3 additions & 229 deletions .github/workflows/installer.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, windows-2022, macos-13, macos-14] # [ubuntu-22.04, windows-2022, macos-13, flyci-macos-14-m2]
os: [macos-14] # [ubuntu-22.04, windows-2022, macos-13, macos-14]

steps:
- name: Check-out repository
Expand Down Expand Up @@ -71,244 +71,18 @@ jobs:
- name: Create python resources file
run: pyside6-rcc ${{ env.PACKAGE_PATH }}/resources.qrc -o ${{ env.PACKAGE_PATH }}/resources.py

- name: Set up screen (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install libxcb-xinerama0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0 libxcb-shape0 libxcb-cursor0
sudo apt-get install libpulse-mainloop-glib0
sudo apt-get install libxkbcommon-x11-0
sudo apt-get install libegl1-mesa-dev
Xvfb :0 -screen 0 1920x1080x24 -ac &
echo "DISPLAY=:0" >> $GITHUB_ENV
# Method 1:
# Not working since Oct 2023. VMware is replaced by VirtualBox
# "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1920 1080
# system_profiler SPDisplaysDataType | grep Resolution
# Method 2:
# Worked on macOS 12.6.9, but the default resolution already was 1920x1080: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6575129372/job/17861583655
# Fails on macOS 12.7, where default resolution is 1176x885: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6576347514/job/17865526935
# Works on macOS 13.6, where default resolution is again 1920x1080: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6576486407/job/17866007760
# brew install screenresolution
# screenresolution list
# screenresolution get
# screenresolution set 1920x1080x32@30
# screenresolution get
- name: Set up screen (macOS, not flyci)
if: matrix.os == 'macos-13' # runner.os == 'macOS'
run: |
system_profiler SPDisplaysDataType | grep Resolution
- name: Set up screen (Windows)
if: runner.os == 'Windows'
run: |
Set-DisplayResolution -Width 1920 -Height 1080 -Force
Get-DisplayResolution
- name: Run app in testmode and quit
shell: bash
run: python ${{ env.PACKAGE_NAME }}/main.py --testmode

- name: Run screenshots comparison tests
run: pytest tests/gui --color=yes

- name: Upload zipped GUI tests screenshots
if: always()
uses: actions/upload-artifact@v4
with:
name: build-installer_screenshots_${{ matrix.os }} # desired name (without .zip) of the zip file to be uploaded
path: | # all files from these paths are zipped into file with name from above
tests/gui/screenshots
.tests/image_diff
if-no-files-found: 'error'
compression-level: 0

- name: Create freezed python app bundle with PyInstaller
run: python ${{ env.SCRIPTS_PATH }}/FreezeApp.py

#- name: Create both online and offline app installer from freezed app bundle
- name: Create offline app installer from freezed app bundle with QtIFW
run: >
python ${{ env.SCRIPTS_PATH }}/MakeInstaller.py
${{ env.BRANCH_NAME }} ${{ matrix.os }}
- name: Sign offline app installer (master branch)
if: github.event_name == 'push' && env.BRANCH_NAME == 'master'
- name: Sign offline app installer
if: github.event_name == 'push'
run: >
python ${{ env.SCRIPTS_PATH }}/SignAppInstaller.py
${{ env.BRANCH_NAME }} ${{ matrix.os }}
${{ secrets.MACOS_CERTIFICATE_ENCODED }} ${{ secrets.MACOS_CERTIFICATE_PASSWORD }}
${{ secrets.APPSTORE_NOTARIZATION_USERNAME }} ${{ secrets.APPSTORE_NOTARIZATION_PASSWORD }}
- name: Create zip archive of offline app installer for distribution
run: >
python ${{ env.SCRIPTS_PATH }}/ZipAppInstaller.py
${{ env.BRANCH_NAME }} ${{ matrix.os }}
- name: Upload double-zipped offline app installer for the next job step
uses: actions/upload-artifact@v4
with:
name: zipped-app-installer_${{ runner.os }}-${{ runner.arch }} # zip of another zip
path: ${{ env.DISTRIBUTION_PATH }}/*.zip
compression-level: 0 # no compression
if-no-files-found: error
retention-days: 10

- name: Upload zipped offline app installer to GitHub releases (non-master branch)
if: github.event_name == 'push' && env.BRANCH_NAME != 'master'
uses: ncipollo/release-action@v1
with:
draft: true
prerelease: true
allowUpdates: true
replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "${{ env.DISTRIBUTION_PATH }}/*.zip"
tag: ${{ env.BRANCH_NAME }}
name: ${{ env.BRANCH_NAME }}
bodyFile: "RELEASE.md"

- name: Upload zipped offline app installer to GitHub releases (master branch)
if: github.event_name == 'push' && env.BRANCH_NAME == 'master'
uses: ncipollo/release-action@v1
with:
draft: true
prerelease: true
allowUpdates: true
replacesArtifacts: true
token: ${{ secrets.GITHUB_TOKEN }}
artifacts: "${{ env.DISTRIBUTION_PATH }}/*.zip"
tag: ${{ env.RELEASE_TAG }}
name: ${{ env.RELEASE_TITLE }}
bodyFile: "RELEASE.md"

#- name: Upload online app installer to repository via FTP (master branch)
# if: github.event_name == 'push' && env.BRANCH_NAME == 'master'
# run: >
# python ${{ env.SCRIPTS_PATH }}/UploadToFtp.py
# ${{ env.BRANCH_NAME }} ${{ matrix.os }}
# ${{ secrets.APP_REPO_FTP_PASSWORD }}

test-installer:
needs: build-installer

timeout-minutes: 15

runs-on: ${{ matrix.os }}

strategy:
fail-fast: false
matrix:
os: [ubuntu-22.04, ubuntu-24.04, windows-2022, macos-13, macos-14] # [ubuntu-22.04, windows-2022, macos-13, flyci-macos-14-m2]

steps:
- name: Check-out repository
uses: actions/checkout@v4

- name: Set up Python environment
uses: actions/setup-python@v5
with:
python-version: 3.11

- name: Upgrade package installer for Python
run: python -m pip install --upgrade pip

- name: Install Python dependences
run: |
python -m pip install flit
flit install --only-deps # Install the dependencies, but not the EasyDiffractionApp package itself
- name: Declare env variables on push only
if: github.event_name == 'push'
shell: bash
run: echo "BRANCH_NAME=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV

- name: Declare env variables on pull_request only
if: github.event_name == 'pull_request'
shell: bash
run: echo "BRANCH_NAME=$GITHUB_HEAD_REF" >> $GITHUB_ENV

- name: Add extra info to pyproject.toml
run: python utils.py --update

- name: Declare env variables on push and pull_request
shell: bash
run: |
echo "SCRIPTS_PATH=$(python utils.py --get ci.project.subdirs.scripts)" >> $GITHUB_ENV
- name: Set up screen (Linux)
if: runner.os == 'Linux'
run: |
sudo apt-get update
sudo apt-get install libxcb-xinerama0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xfixes0 libxcb-shape0 libxcb-cursor0
sudo apt-get install libpulse-mainloop-glib0
sudo apt-get install libxkbcommon-x11-0
sudo apt-get install libegl1-mesa-dev
Xvfb :0 -screen 0 1920x1080x24 -ac &
echo "DISPLAY=:0" >> $GITHUB_ENV
# Method 1:
# Not working since Oct 2023. VMware is replaced by VirtualBox
# "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1920 1080
# system_profiler SPDisplaysDataType | grep Resolution
# Method 2:
# Worked on macOS 12.6.9, but the default resolution already was 1920x1080: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6575129372/job/17861583655
# Fails on macOS 12.7, where default resolution is 1176x885: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6576347514/job/17865526935
# Works on macOS 13.6, where default resolution is again 1920x1080: https://github.com/easyScience/EasyDiffractionBeta/actions/runs/6576486407/job/17866007760
# brew install screenresolution
# screenresolution list
# screenresolution get
# screenresolution set 1920x1080x32@30
# screenresolution get
- name: Set up screen (macOS, not flyci)
if: matrix.os == 'macos-13' # runner.os == 'macOS'
run: |
system_profiler SPDisplaysDataType | grep Resolution
- name: Set up screen (Windows)
if: runner.os == 'Windows'
run: |
Set-DisplayResolution -Width 1920 -Height 1080 -Force
Get-DisplayResolution
- name: Download zipped offline app installer from from the previous job step
uses: actions/download-artifact@v4
with:
name: zipped-app-installer_${{ runner.os }}-${{ runner.arch }} # zip of another zip

- name: Unzip archive with offline app installer for distribution
run: >
python ${{ env.SCRIPTS_PATH }}/UnzipAppInstaller.py
${{ env.BRANCH_NAME }} ${{ matrix.os }}
- name: Make dir for .desktop file (Linux)
if: runner.os == 'Linux'
run: mkdir -p ~/.local/share/applications/

- name: Install app
run: >
python ${{ env.SCRIPTS_PATH }}/InstallApp.py
${{ env.BRANCH_NAME }} ${{ matrix.os }}
- name: Check app istallation is done
run: python ${{ env.SCRIPTS_PATH }}/CheckAppExists.py

- name: Run app in testmode and quit (macOS & Linux)
if: runner.os != 'Windows' # disabled because it can't exit app and one can't see what is going on there (no GitHub logging)...
run: python ${{ env.SCRIPTS_PATH }}/RunApp.py --testmode

- name: Run screenshots comparison tests
if: runner.os != 'Windows' # disabled as didn't run app in test in the previous step
run: pytest tests/gui --color=yes

- name: Upload zipped GUI tests screenshots
if: always()
uses: actions/upload-artifact@v4
with:
name: test-installer_screenshots_${{ matrix.os }} # desired name (without .zip) of the zip file to be uploaded
path: | # all files from these paths are zipped into file with name from above
tests/gui/screenshots
.tests/image_diff
if-no-files-found: 'error'
compression-level: 0

0 comments on commit 5bb8820

Please sign in to comment.