Skip to content

Commit

Permalink
Merge branch 'master' into migrate-to-unitt-decouple
Browse files Browse the repository at this point in the history
  • Loading branch information
drkameleon authored Feb 4, 2025
2 parents 82be3e3 + 6f10987 commit e4e23cc
Show file tree
Hide file tree
Showing 323 changed files with 7,528 additions and 1,430 deletions.
2 changes: 1 addition & 1 deletion .config/utils/ui.nims
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ proc getLogo*(): seq[string] =
r" \__,_|_| \__|\__,_|_| \___/ ",
r"{styles.clear}{styles.bold} ".fmt,
r" Arturo Programming Language{styles.clear} ".fmt,
r" (c)2024 Yanis Zafirópulos ",
r" (c)2025 Yanis Zafirópulos ",
r" ",
]

Expand Down
14 changes: 6 additions & 8 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
3rd-party:
- src/extras/*
- src/extras/**

ast:
- src/vm/ast.nim
Expand Down Expand Up @@ -27,8 +27,7 @@ command line:
documentation:
- examples/projecteuler/*
- examples/rosetta/*
- docs/*
- docs/wiki/*
- docs/**

error handling:
- src/vm/errors.nim
Expand All @@ -50,7 +49,7 @@ installer:
- src/scripts/update.art

library:
- src/library/*
- src/library/**

"→ Arithmetic":
- src/library/Arithmetic.nim
Expand Down Expand Up @@ -146,14 +145,13 @@ ui:
- src/library/Ui.nim

unit-test:
- tests/errors/*
- tests/unittests/*
- tests/errors/**
- tests/unittests/**
- tests/web/*

values:
- src/vm/values/*
- src/vm/values/custom/*
- src/vm/values/custom/quantities/*
- src/vm/values/custom/**

vm:
- src/vm/*
Expand Down
6 changes: 3 additions & 3 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Number of days of inactivity before an issue becomes stale
daysUntilStale: 240
daysUntilStale: 360
# Number of days of inactivity before a stale issue is closed
daysUntilClose: 120
daysUntilClose: 240
# Issues with these labels will never be considered stale
exemptLabels:
- pinned
Expand All @@ -15,4 +15,4 @@ markComment: >
for your contributions.
# Comment to post when closing a stale issue. Set to `false` to disable
closeComment: >
Closing issue as stale.
Closing issue as stale.
4 changes: 2 additions & 2 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ jobs:
reviewdog_version: latest

- name: PR Check
uses: reviewdog/action-nimlint@v1
uses: reviewdog/action-nimlint@v1.17.0
with:
github_token: ${{ secrets.github_token }}
level: 'info'
reporter: github-pr-check # Change reporter.
src: 'src/*.nim'

- name: PR Review
uses: reviewdog/action-nimlint@v1
uses: reviewdog/action-nimlint@v1.17.0
with:
github_token: ${{ secrets.github_token }}
level: 'info'
Expand Down
37 changes: 21 additions & 16 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,18 @@ jobs:
strategy:
matrix:
include:
- {name: "Linux (amd64 / full)", os: ubuntu-latest, arch: amd64, mode: full, shell: bash}
- {name: "Linux (amd64 / safe)", os: ubuntu-latest, arch: amd64, mode: safe, shell: bash}
- {name: "Linux (amd64 / mini)", os: ubuntu-latest, arch: amd64, mode: mini, shell: bash}
- {name: "Linux (arm64 / mini)", os: ubuntu-latest, arch: arm64, mode: mini, shell: bash}
- {name: "JS (web / mini)", os: ubuntu-latest, arch: amd64, mode: web, shell: bash}
- {name: "Windows (amd64 / full)", os: windows-latest, arch: amd64, mode: full, shell: "msys2 {0}"}
- {name: "Windows (amd64 / mini)", os: windows-latest, arch: amd64, mode: mini, shell: "msys2 {0}"}
- {name: "macOS (amd64 / full)", os: macOS-13, arch: amd64, mode: full, shell: bash}
- {name: "macOS (amd64 / mini)", os: macOS-13, arch: amd64, mode: mini, shell: bash}
- {name: "macOS (arm64 / full)", os: macos-latest, arch: arm64, mode: full, shell: bash}
- {name: "macOS (arm64 / mini)", os: macos-latest, arch: arm64, mode: mini, shell: bash}
- {name: "Linux (amd64 / full / webkit-4.1)", os: ubuntu-latest, arch: amd64, mode: full, shell: bash}
- {name: "Linux (amd64 / full)", os: ubuntu-22.04, arch: amd64, mode: full, shell: bash}
- {name: "Linux (amd64 / safe)", os: ubuntu-22.04, arch: amd64, mode: safe, shell: bash}
- {name: "Linux (amd64 / mini)", os: ubuntu-22.04, arch: amd64, mode: mini, shell: bash}
- {name: "Linux (arm64 / mini)", os: ubuntu-22.04, arch: arm64, mode: mini, shell: bash}
- {name: "JS (web / mini)", os: ubuntu-latest, arch: amd64, mode: web, shell: bash}
- {name: "Windows (amd64 / full)", os: windows-latest, arch: amd64, mode: full, shell: "msys2 {0}"}
- {name: "Windows (amd64 / mini)", os: windows-latest, arch: amd64, mode: mini, shell: "msys2 {0}"}
- {name: "macOS (amd64 / full)", os: macOS-13, arch: amd64, mode: full, shell: bash}
- {name: "macOS (amd64 / mini)", os: macOS-13, arch: amd64, mode: mini, shell: bash}
- {name: "macOS (arm64 / full)", os: macos-latest, arch: arm64, mode: full, shell: bash}
- {name: "macOS (arm64 / mini)", os: macos-latest, arch: arm64, mode: mini, shell: bash}

name: ${{ matrix.name }}
defaults:
Expand All @@ -52,7 +53,7 @@ jobs:
src: ${{ github.ref }}
metadata: ${{ env.BRANCH_NAME }}-${{ github.sha }}

- if: (matrix.mode != 'safe' && matrix.mode != 'web') && (matrix.os != 'ubuntu-latest' || matrix.arch != 'arm64')
- if: (matrix.mode != 'safe' && matrix.mode != 'web') && (runner.os != 'Linux' || matrix.arch != 'arm64')
name: Run tests (Old)
run: |
ls -la arturo
Expand All @@ -62,7 +63,7 @@ jobs:
arturo tools/tester.art
cd ..
- if: matrix.mode == 'full' && (matrix.os != 'ubuntu-latest' || matrix.arch != 'arm64')
- if: matrix.mode == 'full' && (runner.os != 'Linux' || matrix.arch != 'arm64')
name: Run tests (Unitt)
run: |
cd arturo
Expand All @@ -75,29 +76,33 @@ jobs:
binary_path="arturo/bin/arturo"
artifact_os="macos"
artifact_os_extra=""
artifact_arch="${{matrix.arch}}"
artifact_mode="${{matrix.mode}}"
if [ "${{matrix.os}}" = "windows-latest" ]; then
if [ "${{runner.os}}" = "Windows" ]; then
artifact_os="windows"
binary_path="${binary_path}.exe"
fi
if [ "${{matrix.os}}" = "ubuntu-latest" ]; then
if [ "${{runner.os}}" = "Linux" ]; then
artifact_os="linux"
if [ "${{matrix.mode}}" = "web" ]; then
artifact_os="js"
artifact_arch="web"
artifact_mode="mini"
binary_path="${binary_path}.js"
fi
if [ "${{matrix.name}}" = "Linux (amd64 / full / webkit-4.1)" ]; then
artifact_os_extra=".webkit41"
fi
fi
cd arturo
git_hash=$(git rev-parse --short "$GITHUB_SHA")
git_stamp="${{ env.BRANCH_NAME}}.${git_hash}"
cd ..
artifact_name="arturo-${git_stamp}-${artifact_arch}-${artifact_os}-${artifact_mode}"
artifact_name="arturo-${git_stamp}-${artifact_arch}-${artifact_os}${artifact_os_extra}-${artifact_mode}"
echo "BINARY_PATH=$binary_path" >> "$GITHUB_OUTPUT"
echo "ARTIFACT_NAME=$artifact_name" >> "$GITHUB_OUTPUT"
Expand Down
Loading

0 comments on commit e4e23cc

Please sign in to comment.