Skip to content

Commit

Permalink
Removes Mac related code
Browse files Browse the repository at this point in the history
Signed-off-by: Roshan Khatri <[email protected]>
  • Loading branch information
roshkhatri committed Apr 16, 2024
1 parent deeb9a8 commit d45e88f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 106 deletions.
10 changes: 0 additions & 10 deletions .github/actions/generate-package-build-matrix/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ outputs:
arm64-build-matrix:
description: The arm64 build matrix.
value: ${{ steps.set-matrix.outputs.armmatrix }}
macos-build-matrix:
description: The macos build matrix.
value: ${{ steps.set-matrix.outputs.macosmatrix }}


runs:
Expand All @@ -35,10 +32,6 @@ runs:
arm_arch=$(jq -c '[.linux_targets[] | select(.arch=="arm64")]' utils/releasetools/build-config.json)
arm_matrix=$(echo "{ \"distro\" : $arm_arch }" | jq -c .)
echo "ARM_MATRIX=$arm_matrix" >> $GITHUB_ENV
macos_arch=$(jq -c '[.macos_targets[] | select(.arch=="x86_64")]' utils/releasetools/build-config.json)
macos_matrix=$(echo "{ \"distro\" : $macos_arch }" | jq -c .)
echo "MACOS_MATRIX=$macos_matrix" >> $GITHUB_ENV
shell: bash

- id: set-matrix
Expand All @@ -49,7 +42,4 @@ runs:
echo $ARM_MATRIX
echo $ARM_MATRIX| jq .
echo "armmatrix=$ARM_MATRIX" >> $GITHUB_OUTPUT
echo $MACOS_MATRIX
echo $MACOS_MATRIX| jq .
echo "macosmatrix=$MACOS_MATRIX" >> $GITHUB_OUTPUT
shell: bash
18 changes: 1 addition & 17 deletions .github/workflows/build-release-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
outputs:
x86_64-build-matrix: ${{ steps.set-matrix.outputs.x86_64-build-matrix }}
arm64-build-matrix: ${{ steps.set-matrix.outputs.arm64-build-matrix }}
macos-build-matrix: ${{ steps.set-matrix.outputs.macos-build-matrix }}
steps:
- name: Checkout repository
uses: actions/checkout@v4
Expand Down Expand Up @@ -84,19 +83,4 @@ jobs:
token: ${{ secrets.GITHUB_TOKEN }}
bucket: ${{ secrets.AWS_S3_BUCKET }}
access_key_id: ${{ secrets.AWS_S3_ACCESS_KEY_ID }}
secret_access_key: ${{ secrets.AWS_S3_ACCESS_KEY }}

# release-build-linux-macos-packages:
# needs:
# - release-build-get-meta
# - generate-build-matrix
# uses: ./.github/workflows/call-build-macos-packages.yml
# with:
# version: ${{ needs.release-build-get-meta.outputs.version }}
# ref: ${{ inputs.version || github.ref_name }}
# build_matrix: ${{ needs.generate-build-matrix.outputs.macos-build-matrix }}
# secrets:
# token: ${{ secrets.GITHUB_TOKEN }}
# bucket: ${{ secrets.AWS_S3_BUCKET }}
# access_key_id: ${{ secrets.AWS_S3_ACCESS_KEY_ID }}
# secret_access_key: ${{ secrets.AWS_S3_ACCESS_KEY }}
secret_access_key: ${{ secrets.AWS_S3_ACCESS_KEY }}
71 changes: 0 additions & 71 deletions .github/workflows/call-build-macos-packages.yml

This file was deleted.

8 changes: 0 additions & 8 deletions utils/releasetools/build-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,5 @@
"type": "deb",
"platform": "focal"
}
],
"macos_targets": [
{
"arch": "x86_64",
"target": "catalina",
"type": "zip",
"platform": "catalina"
}
]
}

0 comments on commit d45e88f

Please sign in to comment.