diff --git a/.github/workflows/Build & Release.yml b/.github/workflows/Build & Release.yml index 48bdf0463ed..81755a32b42 100644 --- a/.github/workflows/Build & Release.yml +++ b/.github/workflows/Build & Release.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: inputs: version: - description: "LBRY version" + description: LBRY version required: true env: @@ -18,16 +18,14 @@ defaults: jobs: build: runs-on: ${{ matrix.os }} - name: ${{ ( startsWith(matrix.os, 'ubuntu') && 'Linux' ) || - ( startsWith(matrix.os, 'windows') && 'Windows' ) || - ( startsWith(matrix.os, 'mac') && 'macOS' ) }} + name: ${{ ( startsWith(matrix.os, 'ubuntu') && 'Linux' ) || ( startsWith(matrix.os, 'windows') && 'Windows' ) || ( startsWith(matrix.os, 'mac') && 'macOS' ) }} strategy: fail-fast: false matrix: node-version: [16.x] os: - ubuntu-latest - - macos-11 + - macos-latest - windows-latest steps: - name: Checkout the repository @@ -45,7 +43,17 @@ jobs: if: startsWith(runner.os, 'mac') uses: maxim-lobanov/setup-xcode@v1 with: - xcode-version: 12.4.0 + xcode-version: 13.1.0 + # Temporary hack (part 1) + - name: Setup Homebrew + if: startsWith(runner.os, 'mac') + uses: Homebrew/actions/setup-homebrew@master + # Temporary hack (part 2) + - name: Install Python 2 + if: startsWith(runner.os, 'mac') + run: | + /bin/bash -c "$(curl -fsSL https://github.com/alfredapp/dependency-scripts/raw/main/scripts/install-python2.sh)" + echo "PYTHON_PATH=/usr/local/bin/python" >> $GITHUB_ENV - name: Download blockchain headers run: | mkdir -p ./static/daemon @@ -54,7 +62,7 @@ jobs: run: | yarn dlx cross-env yarn --network-timeout 600000 - if ${{ startsWith(matrix.os, 'mac') }}; then + if ${{ startsWith(runner.os, 'mac') }}; then sed -i '' 's/electron-builder build/electron-builder --publish=never build/g' package.json sed -i '' 's|github.com/lbryio/lbry-desktop|github.com/paveloom-f/lbry-desktop|g' package.json sed -i '' 's|lbryio|paveloom-f|' static/app-update.yml @@ -75,9 +83,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: ${{ ( startsWith(matrix.os, 'ubuntu') && 'Linux' ) || - ( startsWith(matrix.os, 'windows') && 'Windows' ) || - ( startsWith(matrix.os, 'macOS') && 'macOS' ) }} + name: ${{ ( startsWith(matrix.os, 'ubuntu') && 'Linux' ) || ( startsWith(matrix.os, 'windows') && 'Windows' ) || ( startsWith(matrix.os, 'mac') && 'macOS' ) }} path: | dist/electron/latest.yml dist/electron/latest-mac.yml diff --git a/.yamlfmt b/.yamlfmt new file mode 100644 index 00000000000..e9d24f96ad6 --- /dev/null +++ b/.yamlfmt @@ -0,0 +1,3 @@ +formatter: + type: basic + retain_line_breaks: true