diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7a834934b..055f3f659 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -353,7 +353,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ 'macos-11.0' ] + os: [ 'macos-10.15' ] llvm: [ '11' ] cxxcommon_version: [ 'v0.1.1' ] @@ -444,7 +444,7 @@ jobs: id: cxxcommon_installer working-directory: ${{ steps.build_paths.outputs.DOWNLOADS }} run: | - folder_name="vcpkg_macos-11.0_llvm-${{ matrix.llvm }}_xcode-12.2.0_amd64" + folder_name="vcpkg_${{ matrix.os }}_llvm-${{ matrix.llvm }}_xcode-12.1.0_amd64" archive_name="${folder_name}.tar.xz" url="https://github.com/trailofbits/cxx-common/releases/download/${{ matrix.cxxcommon_version}}/${archive_name}" @@ -585,7 +585,7 @@ jobs: - name: Store the TGZ package uses: actions/upload-artifact@v1 with: - name: macos-11.0_llvm${{ matrix.llvm }}_tgz_package + name: ${{ matrix.os }}_llvm${{ matrix.llvm }}_tgz_package path: ${{ steps.package_names.outputs.TGZ_PACKAGE_PATH }} @@ -652,7 +652,7 @@ jobs: release_macos: # Do not run the release procedure if any of the builds has failed needs: [ build_linux, build_macos ] - runs-on: 'macos-11.0' + runs-on: 'macos-10.15' if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') steps: @@ -674,10 +674,10 @@ jobs: - name: Group the packages by platform run: | - zip -r9 anvill_macos-11.0_packages.zip \ - macos-11.0* + zip -r9 anvill_macos-10.15_packages.zip \ + macos-10.15* - - name: Upload the macOS 11.0 packages + - name: Upload the macOS 10.15 packages uses: actions/upload-release-asset@v1 env: @@ -685,6 +685,6 @@ jobs: with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: anvill_macos-11.0_packages.zip - asset_name: anvill_macos-11.0_packages.zip + asset_path: anvill_macos-10.15_packages.zip + asset_name: anvill_macos-10.15_packages.zip asset_content_type: application/gzip