diff --git a/.github/workflows/linux_build.yml b/.github/workflows/linux_build.yml index 359ee34..e38bc86 100644 --- a/.github/workflows/linux_build.yml +++ b/.github/workflows/linux_build.yml @@ -34,13 +34,6 @@ jobs: - name: Check out git repository uses: actions/checkout@v2 - # step2: sign - - name: Install the Apple certificates - if: matrix.os == 'macos-11' - run: | - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH - # step3: install node env - name: Install Node.js uses: actions/setup-node@v2 @@ -52,20 +45,6 @@ jobs: run: | sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils - # step3: yarn - - name: Yarn install macos - if: matrix.os == 'macos-11' - run: | - yarn - yarn global add xvfb-maybe - npm rebuild --platform=darwin --arch=arm64 sharp - - - name: Yarn install windows - if: matrix.os == 'windows-latest' - run: | - yarn - yarn global add xvfb-maybe - - name: Yarn install linux if: matrix.os == 'ubuntu-latest' run: | diff --git a/.github/workflows/mac_beta.yml b/.github/workflows/mac_beta.yml index 26d4090..26fcdff 100644 --- a/.github/workflows/mac_beta.yml +++ b/.github/workflows/mac_beta.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11] + os: [macos-12] steps: - name: Check out git repository @@ -29,7 +29,7 @@ jobs: # step2: sign - name: Install the Apple certificates - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH @@ -47,7 +47,7 @@ jobs: # step3: yarn - name: Yarn install macos - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | yarn yarn global add xvfb-maybe diff --git a/.github/workflows/mac_build.yml b/.github/workflows/mac_build.yml index 5a9bcde..03f4f48 100644 --- a/.github/workflows/mac_build.yml +++ b/.github/workflows/mac_build.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11] + os: [macos-12] # create steps steps: @@ -36,7 +36,7 @@ jobs: # step2: sign - name: Install the Apple certificates - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH @@ -47,31 +47,14 @@ jobs: with: node-version: '16.x' - - name: Install system deps - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils - # step3: yarn - name: Yarn install macos - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | yarn yarn global add xvfb-maybe npm rebuild --platform=darwin --arch=arm64 sharp - - name: Yarn install windows - if: matrix.os == 'windows-latest' - run: | - yarn - yarn global add xvfb-maybe - - - name: Yarn install linux - if: matrix.os == 'ubuntu-latest' - run: | - yarn - yarn global add xvfb-maybe - - name: Build & release app run: | yarn build diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0c9746e..8ebfe9f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,7 +24,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-11, windows-latest] + os: [ubuntu-latest, macos-12, windows-latest] steps: - name: Check out git repository @@ -32,7 +32,7 @@ jobs: # step2: sign - name: Install the Apple certificates - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH @@ -50,7 +50,7 @@ jobs: # step3: yarn - name: Yarn install macos - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | yarn yarn global add xvfb-maybe diff --git a/.github/workflows/mas.yml b/.github/workflows/mas.yml index 35666dc..2dcab45 100644 --- a/.github/workflows/mas.yml +++ b/.github/workflows/mas.yml @@ -26,7 +26,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-11] + os: [macos-12] # create steps steps: @@ -36,7 +36,7 @@ jobs: # step2: sign - name: Install the Apple certificates - if: matrix.os == 'macos-11' + if: matrix.os == 'macos-12' run: | PP_PATH=$RUNNER_TEMP/build/piclistmas.provisionprofile echo -n "$BUILD_PROVISION_PROFILE_BASE64" | base64 --decode -o $PP_PATH diff --git a/.github/workflows/win_build.yml b/.github/workflows/win_build.yml index afa93c5..3962cf6 100644 --- a/.github/workflows/win_build.yml +++ b/.github/workflows/win_build.yml @@ -34,43 +34,17 @@ jobs: - name: Check out git repository uses: actions/checkout@v2 - # step2: sign - - name: Install the Apple certificates - if: matrix.os == 'macos-11' - run: | - CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12 - echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode -o $CERTIFICATE_PATH - # step3: install node env - name: Install Node.js uses: actions/setup-node@v2 with: node-version: '16.x' - - name: Install system deps - if: matrix.os == 'ubuntu-latest' - run: | - sudo apt-get install --no-install-recommends -y icnsutils graphicsmagick xz-utils - - # step3: yarn - - name: Yarn install macos - if: matrix.os == 'macos-11' - run: | - yarn - yarn global add xvfb-maybe - npm rebuild --platform=darwin --arch=arm64 sharp - - name: Yarn install windows if: matrix.os == 'windows-latest' run: | yarn yarn global add xvfb-maybe - - - name: Yarn install linux - if: matrix.os == 'ubuntu-latest' - run: | - yarn - yarn global add xvfb-maybe - name: Build & release app run: |