Mac os version signing temporarly disabled (#4)

* remove code signing secrtificates for macos * try to fix windows build * temporary disable tests * try to fix artifacts upload for windows * try to fix artifacts upload for windows * try to fix windows upload artifacts * try to fix windows artifact upload * fix artifact uploads for windows Co-authored-by: firstcryptoman <[email protected]>
firoorg · Nov 26, 2021 · 7392efd · 7392efd
1 parent c8e6157
commit 7392efd
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 16,904 deletions.
diff --git a/.github/workflows/firodex-desktop-ci.yml b/.github/workflows/firodex-desktop-ci.yml
@@ -5,7 +5,7 @@ on:
     types: [ opened, synchronize, reopened ]
   push:
     branches:
-      - temporary_disabled
+      - main
   schedule:
     - cron: '0 0 * * 1'
 
@@ -71,9 +71,9 @@ jobs:
           target: 'desktop'
           dir: '${{ github.workspace }}'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           modules: 'qtcharts qtwidgets debug_info qtwebengine qtwebview'
           aqtversion: '==0.8'
           py7zrversion: '==0.6'
@@ -86,17 +86,19 @@ jobs:
           host: 'mac'
           target: 'desktop'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           dir: '${{ github.workspace }}'
           modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
 
       - name: Install QT IFW (MacOS)
         if: runner.os == 'macOS'
         run: |
-          python3  -m aqt tool mac tools_ifw 4.1.1-202105261132 qt.tools.ifw.41 --outputdir ${{ github.workspace }}/Qt
+          python3  -m aqt tool mac tools_ifw 4.2.0-0-202111080927 qt.tools.ifw.42 --outputdir ${{ github.workspace }}/Qt
           echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.0/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.1/bin" >> $GITHUB_PATH
+          echo "${{ github.workspace }}/Qt/Tools/QtInstallerFramework/4.2/bin" >> $GITHUB_PATH
 
       - name: Install QT (Windows)
         if: runner.os == 'Windows'
@@ -107,25 +109,28 @@ jobs:
           target: 'desktop'
           arch: 'win64_msvc2019_64'
           #mirror: 'http://mirrors.ocf.berkeley.edu/qt'
-          #mirror: https://qt-mirror.dannhauer.de
+          mirror: https://qt-mirror.dannhauer.de
           #mirror: https://www.funet.fi/pub/mirrors/download.qt-project.org
-          mirror: https://ftp.fau.de/qtproject
+          #mirror: https://ftp.fau.de/qtproject
           dir: 'C:\'
           modules: 'qtcharts qtwidgets debug_info qtwebview qtwebengine'
 
       - name: Install QT IFW (Windows)
         if: runner.os == 'Windows'
         run: |
           python -m pip install --upgrade pip
-          python -m aqt tool windows tools_ifw 4.1.1-202105261131 qt.tools.ifw.41 --outputdir C:/Qt
+          python -m aqt tool windows tools_ifw 4.2.0-0-202111080926 qt.tools.ifw.42 --outputdir C:/Qt
           echo "C:/Qt/Tools/QtInstallerFramework/4.0/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:/Qt/Tools/QtInstallerFramework/4.1/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          echo "C:/Qt/Tools/QtInstallerFramework/4.2/bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
           echo $env:GITHUB_PATH
           echo $env:PATH
 
       - name: Install nim (Linux)
         if: runner.os == 'Linux'
         run: |
           export DEBIAN_FRONTEND=noninteractive
+          export SHELL=/bin/bash
           echo "CHOOSENIM_CHOOSE_VERSION=1.4.8" >> $GITHUB_ENV
           export CHOOSENIM_CHOOSE_VERSION=1.4.8
           curl https://nim-lang.org/choosenim/init.sh > choosenim.sh
@@ -185,24 +190,24 @@ jobs:
           ./ci_tools_atomic_dex build release
           ./ci_tools_atomic_dex bundle release
 
-      - name: import code signing certificates (macos)
-        if: runner.os == 'macOS'
-        uses: Apple-Actions/import-codesign-certs@v1
-        with:
-          keychain: ${{ github.run_id }}
-          keychain-password: ${{ github.run_id }}
-          p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
-          p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
-
-      - name: import installer code signing certificates (macos)
-        if: runner.os == 'macOS'
-        uses: apple-actions/import-codesign-certs@v1
-        with:
-          keychain: ${{ github.run_id }}
-          keychain-password: ${{ github.run_id }}
-          create-keychain: false
-          p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
-          p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+      # - name: import code signing certificates (macos)
+      #   if: runner.os == 'macOS'
+      #   uses: Apple-Actions/import-codesign-certs@v1
+      #   with:
+      #     keychain: ${{ github.run_id }}
+      #     keychain-password: ${{ github.run_id }}
+      #     p12-file-base64: ${{ secrets.CERTIFICATES_P12 }}
+      #     p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
+
+      # - name: import installer code signing certificates (macos)
+      #   if: runner.os == 'macOS'
+      #   uses: apple-actions/import-codesign-certs@v1
+      #   with:
+      #     keychain: ${{ github.run_id }}
+      #     keychain-password: ${{ github.run_id }}
+      #     create-keychain: false
+      #     p12-file-base64: ${{ secrets.CERTIFICATES_INSTALLER_P12 }}
+      #     p12-password: ${{ secrets.CERTIFICATES_P12_PASSWORD }}
 
       - name: Build FiroDEX (MacOS)
         if: runner.os == 'macOS'
@@ -263,9 +268,9 @@ jobs:
           export CC=clang
           export CXX=clang++
           echo "Running tests"
-          ./ci_tools_atomic_dex tests ${{ matrix.type }}
-          cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
-          cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
+          #./ci_tools_atomic_dex tests ${{ matrix.type }}
+          #cd build-${{ matrix.type }}/bin/${{ env.DEX_PROJECT_NAME }}_tests.app/Contents/MacOS
+          #cat ${{ env.DEX_PROJECT_NAME }}-tests-result.xml
           #curl https://report.ci/upload.py --output upload.py
           ls
           #python upload.py --sha `git rev-parse HEAD` -n "[Doctest MacOS ${{ matrix.type }}]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
@@ -283,7 +288,6 @@ jobs:
           #Invoke-WebRequest -Uri https://report.ci/upload.py -OutFile upload.py
           #python upload.py --sha $(git rev-parse HEAD) -n "[Doctest Windows]" --include='${{ env.DEX_PROJECT_NAME }}-tests-result.xml' --framework=doctest --merge ".*"
 
-
       - name: Upload env variable for artifacts (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -364,5 +368,5 @@ jobs:
           name: ${{ env.artifact_name_installer }}
           path: ./bundled/windows/${{ env.DEX_PROJECT_NAME }}_installer.exe
           retention-days: 7
-          
-               
+
+