Skip to content

Commit df363f4

Browse files
authored
Merge branch 'master' into packin
2 parents 80d8791 + 647d935 commit df363f4

888 files changed

Lines changed: 323231 additions & 77905 deletions

File tree

Some content is hidden

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

.dockerignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
Dockerfile
2-
.git
32
.dockerignore
43
Brewfile
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
---
2+
name: Report a Bug
3+
about: Report a bug that causes vg to crash or otherwise behave incorrectly
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
<!--
11+
Please answer the following questions about your bug.
12+
13+
If you copy commands or output from your terminal, please place the text in its own paragraph, surrounded by lines of three backticks.
14+
15+
```
16+
Like this.
17+
```
18+
19+
-->
20+
21+
**1. What were you trying to do?**
22+
23+
24+
**2. What did you want to happen?**
25+
26+
27+
**3. What actually happened?**
28+
29+
30+
**4. If you got a line like `Stack trace path: /somewhere/on/your/computer/stacktrace.txt`, please copy-paste the contents of that file here:**
31+
32+
```
33+
Place stacktrace here.
34+
```
35+
36+
**5. What data and command can the vg dev team use to make the problem happen?**
37+
38+
39+
**6. What does running `vg version` say?**
40+
41+
```
42+
Place vg version output here
43+
```
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
---
2+
name: Support Request
3+
about: Get help installing or using vg, or get questions answered
4+
title: ''
5+
labels: ''
6+
assignees: ''
7+
8+
---
9+
10+
**PLEASE DO NOT MAKE SUPPORT REQUESTS HERE**
11+
12+
Please the Biostars forum instead:
13+
14+
https://www.biostars.org/new/post/?tag_val=vg

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
## Changelog Entry
2+
To be copied to the [draft changelog](https://github.com/vgteam/vg/wiki/Draft-Changelog) by merger:
3+
4+
* Whatsits now frobnicated
5+
6+
## Description

.github/workflows/testmac.yml

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
name: Test Mac
2+
3+
# Run on our main branch and any PRs to it, and on release tags, but not every
4+
# commit in every branch.
5+
on:
6+
push:
7+
branches:
8+
- master
9+
tags:
10+
- "*"
11+
pull_request:
12+
branches:
13+
- master
14+
15+
jobs:
16+
testmac:
17+
name: Test on Mac
18+
runs-on: macos-12
19+
20+
steps:
21+
- name: Use cache
22+
uses: actions/cache@v2
23+
with:
24+
path: |
25+
deps
26+
lib
27+
include
28+
bin
29+
key: ${{ runner.os }}-12-${{ github.ref }}
30+
# Restore keys are a "list", but really only a multiline string is
31+
# accepted. Also we match by prefix. And the most recent cache is
32+
# used, not the most specific.
33+
# See: https://docs.github.com/en/actions/guides/caching-dependencies-to-speed-up-workflows#matching-a-cache-key
34+
restore-keys: |
35+
${{ runner.os }}-12-${{ github.base_ref }}
36+
${{ runner.os }}-12
37+
38+
- name: Checkout code without submodules
39+
uses: actions/checkout@v2
40+
41+
- name: Get or restore dependencies
42+
run: scripts/restore-deps.sh
43+
44+
- name: Install packages
45+
# We don't use artemnovichkov/action-homebrew because that's for Linux.
46+
# We uninstall everything we don't need in order to prevent linking
47+
# conflicts with existing/outdated packages, which we can't resolve
48+
# because there's no way to tell Homebrew to force-link when installing
49+
# from a Brewfile. We also update Protobuf to make sure we have 3.21.3+
50+
# to avoid problems with ABI changes with/without -DNDEBUG.
51+
# And we update libomp to make extra sure it will be picked up by the compiler.
52+
# We pre-install a pinned txm to work around https://github.com/anko/txm/issues/8
53+
run: |
54+
brew bundle cleanup --force && \
55+
brew bundle install && \
56+
brew update && \
57+
brew install protobuf && \
58+
brew install libomp && \
59+
npm install -g txm@7.4.5 && \
60+
brew config && \
61+
(brew doctor || echo "brew doctor is unhappy")
62+
63+
- name: Run build and test
64+
run: |
65+
export VG_FULL_TRACEBACK=1
66+
echo "Build with $(nproc) threads"
67+
set +e
68+
make -j$(nproc) test
69+
RETVAL=$?
70+
set -e
71+
# Whether vg testing succeeds or fails, see if we can get any Apple crash logs for it.
72+
ls ~/Library/Logs/DiagnosticReports/
73+
for CRASH_FILE in $(ls ~/Library/Logs/DiagnosticReports/vg-* 2>/dev/null) ; do
74+
echo "vg crash report found: ${CRASH_FILE}"
75+
cat ${CRASH_FILE}
76+
done
77+
exit $RETVAL
78+
shell: bash

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ test/*/*.lcp
2323
test/**/*.index/
2424
trash
2525
src/*.gch
26+
.vscode
2627
# Ignore a bunch of files people might dump in the root when testing
2728
/*.vg
2829
/*.gcsa
@@ -42,3 +43,4 @@ src/*.gch
4243
/*.svg
4344
/*.fa
4445
/*.gfa
46+
.vscode/*

0 commit comments

Comments
 (0)