fix: Fixed issue with macos version not running

This commit is contained in:
Allan Jeremy 2022-06-16 17:06:17 +03:00
parent 0dce454258
commit 416f207301

View file

@ -12,94 +12,94 @@ on:
- "prototyping/**" - "prototyping/**"
jobs: jobs:
# windows: windows:
# name: Run ${{ matrix.bench.title }} (Windows ${{matrix.arch}}) name: Run ${{ matrix.bench.title }} (Windows ${{matrix.arch}})
# strategy: strategy:
# fail-fast: false fail-fast: false
# matrix: matrix:
# os: [windows-latest] os: [windows-latest]
# arch: [Win32, x64] arch: [Win32, x64]
# engine: engine:
# - { channel: stable, version: latest } - { channel: stable, version: latest }
# bench: bench:
# - { - {
# script: "run-benchmarks", script: "run-benchmarks",
# timeout: 12, timeout: 12,
# title: "Luau Benchmarks", title: "Luau Benchmarks",
# cachegrindTitle: "Performance", cachegrindTitle: "Performance",
# cachegrindIterCount: 20, cachegrindIterCount: 20,
# } }
# benchResultsRepo: benchResultsRepo:
# - { name: "AllanJeremy/luau-benchmark-results", branch: "main" } - { name: "AllanJeremy/luau-benchmark-results", branch: "main" }
# runs-on: ${{ matrix.os }} runs-on: ${{ matrix.os }}
# steps: steps:
# - name: Checkout Luau repository - name: Checkout Luau repository
# uses: actions/checkout@v3 uses: actions/checkout@v3
# - name: Build Luau - name: Build Luau
# shell: bash # necessary for fail-fast shell: bash # necessary for fail-fast
# run: | run: |
# mkdir build && cd build mkdir build && cd build
# cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo
# cmake --build . --target Luau.Repl.CLI --config RelWithDebInfo cmake --build . --target Luau.Repl.CLI --config RelWithDebInfo
# cmake --build . --target Luau.Analyze.CLI --config RelWithDebInfo cmake --build . --target Luau.Analyze.CLI --config RelWithDebInfo
# - name: Move build files to root - name: Move build files to root
# run: | run: |
# move build/RelWithDebInfo/* . move build/RelWithDebInfo/* .
# - name: Check dir structure - name: Check dir structure
# run: | run: |
# ls build/RelWithDebInfo ls build/RelWithDebInfo
# ls ls
# - uses: actions/setup-python@v3 - uses: actions/setup-python@v3
# with: with:
# python-version: "3.9" python-version: "3.9"
# architecture: "x64" architecture: "x64"
# - name: Install python dependencies - name: Install python dependencies
# run: | run: |
# python -m pip install requests python -m pip install requests
# python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose
# - name: Run benchmark - name: Run benchmark
# run: | run: |
# python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt
# - name: Checkout Benchmark Results repository - name: Checkout Benchmark Results repository
# uses: actions/checkout@v3 uses: actions/checkout@v3
# with: with:
# repository: ${{ matrix.benchResultsRepo.name }} repository: ${{ matrix.benchResultsRepo.name }}
# ref: ${{ matrix.benchResultsRepo.branch }} ref: ${{ matrix.benchResultsRepo.branch }}
# token: ${{ secrets.BENCH_GITHUB_TOKEN }} token: ${{ secrets.BENCH_GITHUB_TOKEN }}
# path: "./gh-pages" path: "./gh-pages"
# - name: Store ${{ matrix.bench.title }} result - name: Store ${{ matrix.bench.title }} result
# uses: Roblox/rhysd-github-action-benchmark@v-luau uses: Roblox/rhysd-github-action-benchmark@v-luau
# with: with:
# name: ${{ matrix.bench.title }} name: ${{ matrix.bench.title }}
# tool: "benchmarkluau" tool: "benchmarkluau"
# output-file-path: ./${{ matrix.bench.script }}-output.txt output-file-path: ./${{ matrix.bench.script }}-output.txt
# external-data-json-path: ./gh-pages/dev/bench/data.json external-data-json-path: ./gh-pages/dev/bench/data.json
# alert-threshold: 150% alert-threshold: 150%
# fail-threshold: 200% fail-threshold: 200%
# fail-on-alert: true fail-on-alert: true
# comment-on-alert: true comment-on-alert: true
# comment-always: true comment-always: true
# github-token: ${{ secrets.GITHUB_TOKEN }} github-token: ${{ secrets.GITHUB_TOKEN }}
# - name: Push benchmark results - name: Push benchmark results
# if: github.event_name == 'push' if: github.event_name == 'push'
# run: | run: |
# echo "Pushing benchmark results..." echo "Pushing benchmark results..."
# cd gh-pages cd gh-pages
# git config user.name github-actions git config user.name github-actions
# git config user.email github@users.noreply.github.com git config user.email github@users.noreply.github.com
# git add ./dev/bench/data.json git add ./dev/bench/data.json
# git commit -m "Add benchmarks results for ${{ github.sha }}" git commit -m "Add benchmarks results for ${{ github.sha }}"
# git push git push
# cd .. cd ..
unix: unix:
name: Run ${{ matrix.bench.title }} (${{ matrix.os}}) name: Run ${{ matrix.bench.title }} (${{ matrix.os}})
@ -123,84 +123,80 @@ jobs:
- name: Checkout Luau repository - name: Checkout Luau repository
uses: actions/checkout@v3 uses: actions/checkout@v3
- name: Something that should run on ubuntu-latest only - name: Build Luau
if: matrix.os == 'ubuntu-latest' run: make config=release luau luau-analyze
- uses: actions/setup-python@v3
with:
python-version: "3.9"
architecture: "x64"
- name: Install python dependencies
run: | run: |
echo "Running on ubuntu-latest" python -m pip install requests
# - name: Build Luau python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose
# run: make config=release luau luau-analyze
# - uses: actions/setup-python@v3 - name: Run benchmark
# with: run: |
# python-version: "3.9" python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt
# architecture: "x64"
# - name: Install python dependencies - name: Install valgrind
# run: | if: matrix.os == ubuntu-latest
# python -m pip install requests run: |
# python -m pip install --user numpy scipy matplotlib ipython jupyter pandas sympy nose sudo apt-get install valgrind
# - name: Run benchmark - name: Run ${{ matrix.bench.title }} (Cold Cachegrind)
# run: | if: matrix.os == ubuntu-latest
# python bench/bench.py | tee ${{ matrix.bench.script }}-output.txt run: sudo bash ./scripts/run-with-cachegrind.sh python ./bench/bench.py "${{ matrix.bench.cachegrindTitle}}Cold" 1 | tee -a ${{ matrix.bench.script }}-output.txt
# - name: Install valgrind - name: Run ${{ matrix.bench.title }} (Warm Cachegrind)
# if: ${{ matrix.os }} == ubuntu-latest if: matrix.os == ubuntu-latest
# run: | run: sudo bash ./scripts/run-with-cachegrind.sh python ./bench/bench.py "${{ matrix.bench.cachegrindTitle }}" ${{ matrix.bench.cachegrindIterCount }} | tee -a ${{ matrix.bench.script }}-output.txt
# sudo apt-get install valgrind
# - name: Run ${{ matrix.bench.title }} (Cold Cachegrind) - name: Checkout Benchmark Results repository
# if: ${{ matrix.os }} == ubuntu-latest uses: actions/checkout@v3
# run: sudo bash ./scripts/run-with-cachegrind.sh python ./bench/bench.py "${{ matrix.bench.cachegrindTitle}}Cold" 1 | tee -a ${{ matrix.bench.script }}-output.txt with:
repository: ${{ matrix.benchResultsRepo.name }}
ref: ${{ matrix.benchResultsRepo.branch }}
token: ${{ secrets.BENCH_GITHUB_TOKEN }}
path: "./gh-pages"
# - name: Run ${{ matrix.bench.title }} (Warm Cachegrind) - name: Store ${{ matrix.bench.title }} result
# if: ${{ matrix.os }} == ubuntu-latest uses: Roblox/rhysd-github-action-benchmark@v-luau
# run: sudo bash ./scripts/run-with-cachegrind.sh python ./bench/bench.py "${{ matrix.bench.cachegrindTitle }}" ${{ matrix.bench.cachegrindIterCount }} | tee -a ${{ matrix.bench.script }}-output.txt with:
name: ${{ matrix.bench.title }}
tool: "benchmarkluau"
output-file-path: ./${{ matrix.bench.script }}-output.txt
external-data-json-path: ./gh-pages/dev/bench/data.json
alert-threshold: 150%
fail-threshold: 200%
fail-on-alert: true
comment-on-alert: true
comment-always: true
github-token: ${{ secrets.GITHUB_TOKEN }}
# - name: Checkout Benchmark Results repository - name: Store ${{ matrix.bench.title }} result (CacheGrind)
# uses: actions/checkout@v3 uses: Roblox/rhysd-github-action-benchmark@v-luau
# with: if: matrix.os == ubuntu-latest
# repository: ${{ matrix.benchResultsRepo.name }} with:
# ref: ${{ matrix.benchResultsRepo.branch }} name: ${{ matrix.bench.title }} (CacheGrind)
# token: ${{ secrets.BENCH_GITHUB_TOKEN }} tool: "roblox"
# path: "./gh-pages" output-file-path: ./${{ matrix.bench.script }}-output.txt
external-data-json-path: ./gh-pages/dev/bench/data.json
alert-threshold: 150%
fail-threshold: 1000%
fail-on-alert: false
comment-on-alert: true
github-token: ${{ secrets.GITHUB_TOKEN }}
# - name: Store ${{ matrix.bench.title }} result - name: Push benchmark results
# uses: Roblox/rhysd-github-action-benchmark@v-luau if: github.event_name == 'push'
# with: run: |
# name: ${{ matrix.bench.title }} echo "Pushing benchmark results..."
# tool: "benchmarkluau" cd gh-pages
# output-file-path: ./${{ matrix.bench.script }}-output.txt git config user.name github-actions
# external-data-json-path: ./gh-pages/dev/bench/data.json git config user.email github@users.noreply.github.com
# alert-threshold: 150% git add ./dev/bench/data.json
# fail-threshold: 200% git commit -m "Add benchmarks results for ${{ github.sha }}"
# fail-on-alert: true git push
# comment-on-alert: true cd ..
# comment-always: true
# github-token: ${{ secrets.GITHUB_TOKEN }}
# - name: Store ${{ matrix.bench.title }} result (CacheGrind)
# uses: Roblox/rhysd-github-action-benchmark@v-luau
# if: ${{ matrix.os }} == ubuntu-latest
# with:
# name: ${{ matrix.bench.title }} (CacheGrind)
# tool: "roblox"
# output-file-path: ./${{ matrix.bench.script }}-output.txt
# external-data-json-path: ./gh-pages/dev/bench/data.json
# alert-threshold: 150%
# fail-threshold: 1000%
# fail-on-alert: false
# comment-on-alert: true
# github-token: ${{ secrets.GITHUB_TOKEN }}
# - name: Push benchmark results
# if: github.event_name == 'push'
# run: |
# echo "Pushing benchmark results..."
# cd gh-pages
# git config user.name github-actions
# git config user.email github@users.noreply.github.com
# git add ./dev/bench/data.json
# git commit -m "Add benchmarks results for ${{ github.sha }}"
# git push
# cd ..