Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: TOOLS-2932 use github actions to build m-series macos #290

Merged
merged 8 commits into from
Jul 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/mac-artifact.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
repository_dispatch:
types: mac-build
push:
branches: [actionsHub, master, test-ready, "bugfix-*"]
branches: [actionsHub, master, "bugfix-*"]
pull_request:
branches: [test-ready, master]
branches: [master]
workflow_call:
inputs:
submodule:
Expand All @@ -16,7 +16,10 @@ on:

jobs:
build:
runs-on: macos-11
strategy:
matrix:
os: [macos-12, macos-14]
runs-on: ${{ matrix.os }}
steps:
- name: Get checkout directory
uses: haya14busa/action-cond@v1
Expand Down Expand Up @@ -47,13 +50,13 @@ jobs:
run: |
git describe --tags --always
echo "tag=$(git describe --tags --always)" >> $GITHUB_OUTPUT
- uses: kenchan0130/actions-system-info@master
- uses: kenchan0130/actions-system-info@v1.3.0
id: system-info
- name: Get Python version from Pipfile
working-directory: ${{ steps.working-dir.outputs.value }}
run: |
git rev-parse HEAD
echo "PYTHON_VERSION=$(grep "python_full_version" Pipfile | cut -d ' ' -f 3 - | tr -d '"')" >> $GITHUB_ENV
echo "PYTHON_VERSION=$(grep "python_version" Pipfile | cut -d ' ' -f 3 - | tr -d '"')" >> $GITHUB_ENV
echo ${{ steps.system-info.outputs.name }}
echo ${{ steps.system-info.outputs.kernel-release }}
echo ${{ steps.system-info.outputs.platform }}
Expand Down Expand Up @@ -97,7 +100,7 @@ jobs:
working-directory: ${{ steps.working-dir.outputs.value }}
run: |
tar -C build/bin/ -cvf asadm.tar asadm
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ steps.system-info.outputs.platform }}-${{ runner.arch }}-${{ runner.os }}-${{ steps.system-info.outputs.release }}-asadm
path: ${{ steps.working-dir.outputs.value }}/asadm.tar
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/snyk-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
- name: Get Python version from Pipfile
working-directory: ${{ steps.working-dir.outputs.value }}
run: |
echo "PYTHON_VERSION=$(grep "python_full_version" Pipfile | cut -d ' ' -f 3 - | tr -d '"')" >> $GITHUB_ENV
echo "PYTHON_VERSION=$(grep "python_version" Pipfile | cut -d ' ' -f 3 - | tr -d '"')" >> $GITHUB_ENV
- name: Setup Python
uses: actions/setup-python@v3
with:
Expand All @@ -28,7 +28,7 @@ jobs:
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Upload snyk results
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: asadm-snyk.txt
path: asadm-snyk.txt
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
pipenv run bash -c "coverage xml"
- name: Upload Collectinfo for Debugging
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: test_collectinfo
path: /tmp/asadm_test*
if-no-files-found: error
- name: Upload Health Struct for Debugging
if: failure()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: health_files
path: "*_health_input.txt"
Expand Down
2 changes: 1 addition & 1 deletion Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ aerospike = "*"
docker = "*"

[requires]
python_full_version = "3.10.13"
python_version = "3.10"

[pipenv]
allow_prereleases = true
Loading
Loading