Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Tokazama/Metadata.jl
Browse files Browse the repository at this point in the history
  • Loading branch information
Tokazama committed Jan 30, 2021
2 parents 2dd9f68 + 40f6650 commit c2e309b
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 46 deletions.
33 changes: 19 additions & 14 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
name: CI
on:
pull_request:
branches:
- master
push:
branches:
- master
tags: '*'
branches: [master]
tags: ["*"]
pull_request:
jobs:
test:
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }} - ${{ github.event_name }}
Expand All @@ -15,12 +12,25 @@ jobs:
fail-fast: false
matrix:
version:
- '1'
- 'nightly'
- 1.0
- 1 # automatically expands to the latest stable 1.x release of Julia
- nightly
os:
- ubuntu-latest
arch:
- x64
- x86
include:
# test macOS and Windows with latest Julia only
- os: macOS-latest
arch: x64
version: 1
- os: windows-latest
arch: x64
version: 1
- os: windows-latest
arch: x86
version: 1
steps:
- uses: actions/checkout@v2
- uses: julia-actions/setup-julia@v1
Expand Down Expand Up @@ -56,13 +66,8 @@ jobs:
using Pkg
Pkg.develop(PackageSpec(path=pwd()))
Pkg.instantiate()'
- run: |
julia --project=docs -e '
using Documenter: doctest
using Metadata
doctest(Metadata)'
- run: julia --project=docs docs/make.jl
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }}

3 changes: 2 additions & 1 deletion src/metastruct.jl
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@ Base.copy(x::MetaStruct) = propagate_metadata(x, deepcopy(parent(x)))
@_define_function_no_prop_first(Base, ==, MetaStruct, Missing)
@_define_function_no_prop_last(Base, ==, Missing, MetaStruct)
@_define_function_no_prop_first(Base, ==, MetaStruct, WeakRef)
@_define_function_no_prop_last(Base, ==, WeakRef, MetaStruct)
@_define_function_no_prop_last(Base, ==, WeakRef, MetaStruct)

31 changes: 0 additions & 31 deletions test/metaid.jl

This file was deleted.

0 comments on commit c2e309b

Please sign in to comment.