Skip to content

Commit

Permalink
Add support for macOS runners
Browse files Browse the repository at this point in the history
Signed-off-by: Evgeniy Zayats <zayatsevgeniy@nspcc.io>
  • Loading branch information
Evgeniy Zayats committed May 13, 2024
1 parent 5b662e6 commit c658e60
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 4 deletions.
24 changes: 21 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ permissions: write-all

jobs:
run_system_tests:
runs-on: ubuntu-latest
runs-on: ${{ matrix.os.runner }}
strategy:
fail-fast: false
matrix:
os: [{runner: 'ubuntu-latest'}, {runner: 'macos-14'}]
timeout-minutes: 500
steps:
- name: Get the current date
Expand Down Expand Up @@ -190,7 +194,14 @@ jobs:
env:
DATA_DIR: ${{ env.REPL_DATA_DIR }}
run: |
find $DATA_DIR -type f -name '*.txt' -exec sed -i '$ s/$/_replaced_obj_by_obj/' {} +
if [ "$RUNNER_OS" == "Linux" ]; then
find $DATA_DIR -type f -name '*.txt' -exec sed -i '$ s/$/_replaced_obj_by_obj/' {} +
elif [ "$RUNNER_OS" == "macOS" ]; then
find $DATA_DIR -type f -name '*.txt' -exec sed -i '' '$ s/$/_replaced_obj_by_obj/' {} +
else
echo "$RUNNER_OS not supported"
exit 1
fi
- name: Run gh-push-to-neofs with objects replacement
id: gh_push_to_neofs_with_replace_objects
Expand Down Expand Up @@ -253,7 +264,14 @@ jobs:
env:
DATA_DIR: ${{ env.REWRITE_CONT_DIR }}
run: |
find $DATA_DIR -type f -name '*.txt' -exec sed -i '$ s/$/_cont_rewrite/' {} +
if [ "$RUNNER_OS" == "Linux" ]; then
find $DATA_DIR -type f -name '*.txt' -exec sed -i '$ s/$/_cont_rewrite/' {} +
elif [ "$RUNNER_OS" == "macOS" ]; then
find $DATA_DIR -type f -name '*.txt' -exec sed -i '' '$ s/$/_cont_rewrite/' {} +
else
echo "$RUNNER_OS not supported"
exit 1
fi
- name: Run gh-push-to-neofs with objects replacement
id: gh_push_to_neofs_with_cont_rewrite
Expand Down
19 changes: 18 additions & 1 deletion action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,24 @@ outputs:
runs:
using: composite
steps:
- name: Download latest stable neofs-cli for uploading reports to NeoFS
- name: Download latest stable neofs-cli for uploading reports to NeoFS for Linux
uses: dsaltares/fetch-gh-release-asset@1.1.1
if: runner.os == 'Linux'
with:
repo: 'nspcc-dev/neofs-node'
version: 'tags/v0.38.1'
file: 'neofs-cli-amd64'
target: 'neofs/neofs-cli'

- name: Download latest stable neofs-cli for uploading reports to NeoFS for macOS
uses: dsaltares/fetch-gh-release-asset@1.1.1
if: runner.os == 'macOS'
with:
repo: 'nspcc-dev/neofs-node'
version: 'tags/v0.41.1'
file: 'neofs-cli-darwin-arm64'
target: 'neofs/neofs-cli'

- name: Chmod latest stable neofs-cli
shell: bash
run: |
Expand All @@ -84,6 +94,13 @@ runs:
run: |
echo "$NEOFS_WALLET" | base64 -d > "$GITHUB_ACTION_PATH/wallet.json"
- name: Install required package if running on macos
shell: bash
run: |
if [ "$RUNNER_OS" == "macOS" ]; then
brew install libmagic
fi
- name: Prepare venv
shell: bash
id: prepare_venv
Expand Down
2 changes: 2 additions & 0 deletions push-to-neofs.py
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ def list_objects_in_container(endpoint: str,
f"NEOFS_CLI_PASSWORD={password} neofs-cli --rpc-endpoint {endpoint} "
f"--wallet {wallet} container list-objects --cid {cid}"
)
print(cmd)
return neofs_cli_execute(cmd)


Expand All @@ -159,6 +160,7 @@ def delete_objects(
f"NEOFS_CLI_PASSWORD={password} neofs-cli --rpc-endpoint {endpoint} "
f"--wallet {wallet} object delete --cid {cid} --oid '{oid}'"
)
print(cmd)
neofs_cli_execute(cmd)


Expand Down

0 comments on commit c658e60

Please sign in to comment.