Skip to content

Commit

Permalink
Merge pull request #33
Browse files Browse the repository at this point in the history
Updating package before registration
  • Loading branch information
maltezfaria authored Feb 8, 2024
2 parents 6376083 + e4f8f35 commit f8e641b
Show file tree
Hide file tree
Showing 33 changed files with 2,294 additions and 1,234 deletions.
32 changes: 32 additions & 0 deletions .JuliaFormatter.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
ignore = ["docs/*"]

indent = 4
margin = 92
whitespace_typedefs = false
always_for_in = true
whitespace_ops_in_indices = false
remove_extra_newlines = true
import_to_using = false
pipe_to_function_call = false
short_to_long_function_def = true
long_to_short_function_def = false
always_use_return = true
whitespace_in_kwargs = true
annotate_untyped_fields_with_any = false
format_docstrings = false
# alignement options
align_assignment = true
# align_struct_field = true
align_conditional = true
align_pair_arrow = true
align_matrix = false
#
conditional_to_if = true
normalize_line_endings = "auto"
trailing_comma = true
trailing_zero = true
join_lines_based_on_source = false
indent_submodule = true
separate_kwargs_with_semicolon = true
surround_whereop_typeparameters = true
for_in_replacement = "in"
47 changes: 22 additions & 25 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
name: CI
on:
- push
- pull_request
push:
branches:
- main
tags: ['*']
pull_request:
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
Expand All @@ -10,19 +13,18 @@ jobs:
fail-fast: false
matrix:
version:
- '1.7'
- 'nightly'
- '1'
os:
- ubuntu-latest
arch:
- x64
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: ${{ matrix.version }}
arch: ${{ matrix.arch }}
- uses: actions/cache@v1
- uses: actions/cache@v4
env:
cache-name: cache-artifacts
with:
Expand All @@ -35,29 +37,24 @@ jobs:
- uses: julia-actions/julia-buildpkg@v1
- uses: julia-actions/julia-runtest@v1
- uses: julia-actions/julia-processcoverage@v1
- uses: codecov/codecov-action@v1
- uses: codecov/codecov-action@v4
with:
file: lcov.info
fail_ci_if_error: false # optional (default = false)
token: ${{ secrets.CODECOV_TOKEN }} # required
docs:
name: Documentation
runs-on: ubuntu-latest
runs-on: self-hosted
env:
JULIA_NUM_THREADS: 8
permissions:
contents: write
statuses: write
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: julia-actions/setup-julia@v1
with:
version: '1'
- run: |
julia --project=docs -e '
using Pkg
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
- run: |
julia --project=docs -e '
using Documenter: DocMeta, doctest
using IFGF
DocMeta.setdocmeta!(IFGF, :DocTestSetup, :(using IFGF); recursive=true)
doctest(IFGF)'
- run: julia --project=docs docs/make.jl
- name: Install dependencies
run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()'
- name: Build and deploy
run: julia --project=docs/ docs/make.jl
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}
37 changes: 33 additions & 4 deletions .github/workflows/CompatHelper.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,43 @@ on:
schedule:
- cron: 0 0 * * *
workflow_dispatch:
permissions:
contents: write
pull-requests: write
jobs:
CompatHelper:
runs-on: ubuntu-latest
steps:
- name: Pkg.add("CompatHelper")
run: julia -e 'using Pkg; Pkg.add("CompatHelper")'
- name: CompatHelper.main()
- name: Check if Julia is already available in the PATH
id: julia_in_path
run: which julia
continue-on-error: true
- name: Install Julia, but only if it is not already available in the PATH
uses: julia-actions/setup-julia@v1
with:
version: '1'
arch: ${{ runner.arch }}
if: steps.julia_in_path.outcome != 'success'
- name: "Add the General registry via Git"
run: |
import Pkg
ENV["JULIA_PKG_SERVER"] = ""
Pkg.Registry.add("General")
shell: julia --color=yes {0}
- name: "Install CompatHelper"
run: |
import Pkg
name = "CompatHelper"
uuid = "aa819f21-2bde-4658-8897-bab36330d9b7"
version = "3"
Pkg.add(; name, uuid, version)
shell: julia --color=yes {0}
- name: "Run CompatHelper"
run: |
import CompatHelper
CompatHelper.main()
shell: julia --color=yes {0}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COMPATHELPER_PRIV: ${{ secrets.DOCUMENTER_KEY }}
run: julia -e 'using CompatHelper; CompatHelper.main()'
# COMPATHELPER_PRIV: ${{ secrets.COMPATHELPER_PRIV }}
5 changes: 5 additions & 0 deletions .github/workflows/TagBot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ on:
types:
- created
workflow_dispatch:
inputs:
lookback:
default: 3
permissions:
contents: write
jobs:
TagBot:
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
*.jl.mem
/docs/build/
/sandbox/
/benchmark/**
/test/Manifest.toml
/docs/Manifest.toml
Manifest.toml
Expand Down
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
FFTW = "7a1cc6ca-52ef-59f5-83cd-3a7055c09341"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7"
RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
TimerOutputs = "a759f4b9-e2f1-59dc-863e-4aeb61b1ea8f"
WavePropBase = "91c5bd54-65f5-4719-ae3b-9579edfc4a0b"

[compat]
AbstractTrees = "0.3,0.4"
Expand All @@ -21,8 +22,7 @@ FFTW = "1"
RecipesBase = "1"
StaticArrays = "1"
TimerOutputs = "0.5"
WavePropBase = "0.2"
julia = "1.6"
julia = "1.9"

[extras]
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
Expand Down
Binary file removed benchmarks/helmholtz/sphere_k_scaling.png
Binary file not shown.
Binary file removed benchmarks/helmholtz/sphere_n_scaling.png
Binary file not shown.
37 changes: 0 additions & 37 deletions benchmarks/helmholtz/vary_k.jl

This file was deleted.

60 changes: 0 additions & 60 deletions benchmarks/helmholtz/vary_n.jl

This file was deleted.

Binary file removed benchmarks/laplace/sphere_n_scaling.png
Binary file not shown.
61 changes: 0 additions & 61 deletions benchmarks/laplace/vary_n.jl

This file was deleted.

Loading

0 comments on commit f8e641b

Please sign in to comment.