Skip to content

Commit 231d356

Browse files
Merge branch 'master' into compathelper/new_version/2023-08-31-00-30-50-090-02054122287
2 parents c9c9c86 + bfab69d commit 231d356

File tree

136 files changed

+33557
-6502
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

136 files changed

+33557
-6502
lines changed

.buildkite/build_benchmark.sh

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,20 @@
22

33
set -euo pipefail
44

5+
JULIAHUBREGISTRY_BENCHMARK_TARGETS=(benchmarks/ModelingToolkit/)
6+
OPENMODELICA_BENCHMARK_TARGETS=(benchmarks/ModelingToolkit/)
7+
8+
if [[ "${JULIAHUBREGISTRY_BENCHMARK_TARGETS[*]}" =~ "${1}" ]]; then
9+
echo "--- :julia: Adding JuliaHubRegistry"
10+
11+
export JULIA_PKG_SERVER="juliahub.com"
12+
mkdir -p "${JULIA_DEPOT_PATH}/servers/${JULIA_PKG_SERVER}"
13+
cp .buildkite/secrets/token.toml "${JULIA_DEPOT_PATH}/servers/${JULIA_PKG_SERVER}/auth.toml"
14+
julia -e 'using Pkg; Pkg.Registry.add(); Pkg.Registry.status()'
15+
fi
16+
517
# Instantiate, to install the overall project dependencies, and `build()` for conda
6-
echo "--- Instantiate"
18+
echo "--- :julia: Instantiate"
719
julia --project=. -e 'using Pkg; Pkg.instantiate(); Pkg.build()'
820

921
if [[ "${1}" == *BayesianInference* ]]; then
@@ -17,6 +29,6 @@ if [[ "${1}" == *BayesianInference* ]]; then
1729
fi
1830

1931
# Run benchmark
20-
echo "+++ Run benchmark for ${1}"
32+
echo "+++ :julia: Run benchmark for ${1}"
2133
julia --threads=auto --project=. benchmark.jl "${1}"
2234

.buildkite/launch_benchmarks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ agents:
33
sandbox_capable: true
44

55
steps:
6-
- label: ":runner: Dynamically launch run_tutorial.yml"
6+
- label: ":runner: Dynamically launch run_benchmark.yml"
77
branches: "!gh-pages"
88
env:
99
BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET: ${BUILDKITE_PLUGIN_CRYPTIC_BASE64_SIGNED_JOB_ID_SECRET?}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Salted__�Y/��|ܼA�7�*�3I �����ԍ����p?9���%��[>VB���E�������FZU��/�� �T������E@/�k���e
1+
Salted__j(`�$~���Ic h��B'6����C�E����"c2>꿄���XW�m.Ɲ6��K_���5L�FV‚�Xp�sE����

.buildkite/run_benchmark.yml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,15 @@ steps:
1414
- BUILDKITE_S3_ACCESS_KEY_ID="U2FsdGVkX1+x3xs1ZRRZRt3FmwFQmYYKnpV7o8xKkX5Ib6y0o5fv0+rskVAj+JKu"
1515
- BUILDKITE_S3_SECRET_ACCESS_KEY="U2FsdGVkX1+LWh1yX7LsMBlecEJLc08eJrgOhurhd47CY1/jS3wCGVCQmS1t6f2j70spBoFdfc9kn2naj8HH5A=="
1616
- BUILDKITE_S3_DEFAULT_REGION="U2FsdGVkX18ccoE9FmtkwsCm1x0MLMBlN/FLcAyKkY4="
17+
files:
18+
- .buildkite/secrets/token.toml
1719
- JuliaCI/julia#v1:
18-
version: 1.9
20+
version: "1.10"
1921
- staticfloat/sandbox:
20-
rootfs_url: "https://github.com/ven-k/Placeholder/releases/download/v0.23.0/aws_uploader.x86_64.tar.gz"
21-
rootfs_treehash: "d46b35aa927024de8729d63fde18442a0a590e62"
22+
rootfs_url: "https://github.com/thazhemadam/openmodelica-rootfs-image/releases/download/v1.23.0/rootfs-openmodelica-v1.23.0.amd64.tar.gz"
23+
rootfs_treehash: "82970243dc4f188e599a976abc20951f4aba2912"
24+
uid: 1000
25+
gid: 1000
2226
workspaces:
2327
# Include the julia we just downloaded
2428
- "/cache/julia-buildkite-plugin:/cache/julia-buildkite-plugin"
@@ -34,6 +38,8 @@ steps:
3438
#- html/**/*.html
3539
- markdown/**/figures/*.png
3640
- markdown/**/*.md
41+
- markdown/**/*.pdf
42+
- markdown/**/*.svg
3743
- notebook/**/*.ipynb
3844
- pdf/**/*.pdf
3945
- script/**/*.jl

.buildkite/secrets/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
token.toml
992 Bytes
Binary file not shown.

.buildkite/test_sciml.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,4 @@ steps:
1919
agents:
2020
queue: "juliaecosystem"
2121
arch: "x86_64"
22+
os: "linux"

.github/dependabot.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,6 @@ updates:
55
directory: "/" # Location of package manifests
66
schedule:
77
interval: "weekly"
8+
ignore:
9+
- dependency-name: "crate-ci/typos"
10+
update-types: ["version-update:semver-patch", "version-update:semver-minor"]

.github/workflows/CompatHelper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
build:
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Pkg.add("CompatHelper")
1515
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
1616
- name: CompatHelper.main()

.github/workflows/SpellCheck.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Spell Check
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
typos-check:
7+
name: Spell Check with Typos
8+
runs-on: ubuntu-latest
9+
steps:
10+
- name: Checkout Actions Repository
11+
uses: actions/checkout@v4
12+
- name: Check spelling
13+
uses: crate-ci/[email protected]

0 commit comments

Comments
 (0)