Skip to content

Commit

Permalink
Merge branch 'main' into speed-up-testpatch
Browse files Browse the repository at this point in the history
  • Loading branch information
6543 authored May 16, 2021
2 parents 1939817 + 41136db commit ffe6a4d
Show file tree
Hide file tree
Showing 19 changed files with 350 additions and 3 deletions.
20 changes: 20 additions & 0 deletions options/gitignore/AltiumDesigner
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# For PCBs designed using Altium Designer
# Website: https://www.altium.com/altium-designer/

# Directories containing cache data
History
__Previews

# Directories containing logs and generated outputs
Project\ Logs*
Project\ Outputs*

# Misc files generated by altium
debug.log
Status\ Report.txt
*.PcbDoc.htm
*.SchDocPreview
*.PcbDocPreview

# Lock files sometimes left behind
.~lock.*
1 change: 1 addition & 0 deletions options/gitignore/Autotools
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ autom4te.cache
/autoscan-*.log
/aclocal.m4
/compile
/config.cache
/config.guess
/config.h.in
/config.log
Expand Down
4 changes: 3 additions & 1 deletion options/gitignore/Coq
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*.glob
*.ml.d
*.ml4.d
*.mlg.d
*.mli.d
*.mllib.d
*.mlpack.d
Expand All @@ -20,7 +21,7 @@
*.vo
*.vok
*.vos
.coq-native/
.coq-native
.csdp.cache
.lia.cache
.nia.cache
Expand All @@ -31,6 +32,7 @@ lia.cache
nia.cache
nlia.cache
nra.cache
native_compute_profile_*.data

# generated timing files
*.timing.diff
Expand Down
3 changes: 3 additions & 0 deletions options/gitignore/Dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ pubspec.lock
# If you don't generate documentation locally you can remove this line.
doc/api/

# dotenv environment variables file
.env*

# Avoid committing generated Javascript files:
*.dart.js
*.info.json # Produced by the --dump-info flag.
Expand Down
2 changes: 1 addition & 1 deletion options/gitignore/IAR_EWARM
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# gitignore template for the IAR EWARM
# website: https://www.iar.com/
# website: https://www.iar.com/knowledge/support/technical-notes/ide/which-files-should-be-version-controlled/

# Some tools will put the EWARM files
# under a subdirectory with the same name
Expand Down
3 changes: 3 additions & 0 deletions options/gitignore/JetBrains
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
.idea/**/dictionaries
.idea/**/shelf

# AWS User-specific
.idea/**/aws.xml

# Generated files
.idea/**/contentModel.xml

Expand Down
29 changes: 29 additions & 0 deletions options/gitignore/ROS2
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
install/
log/
build/

# Ignore generated docs
*.dox
*.wikidoc

# eclipse stuff
.project
.cproject

# qcreator stuff
CMakeLists.txt.user

srv/_*.py
*.pcd
*.pyc
qtcreator-*
*.user

*~

# Emacs
.#*

# Colcon custom files
COLCON_IGNORE
AMENT_IGNORE
3 changes: 3 additions & 0 deletions options/gitignore/Rust
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb
3 changes: 3 additions & 0 deletions options/gitignore/Scala
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
*.class
*.log

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
135 changes: 135 additions & 0 deletions options/gitignore/Strapi
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
############################
# OS X
############################

.DS_Store
.AppleDouble
.LSOverride
Icon
.Spotlight-V100
.Trashes
._*


############################
# Linux
############################

*~


############################
# Windows
############################

Thumbs.db
ehthumbs.db
Desktop.ini
$RECYCLE.BIN/
*.cab
*.msi
*.msm
*.msp


############################
# Packages
############################

*.7z
*.csv
*.dat
*.dmg
*.gz
*.iso
*.jar
*.rar
*.tar
*.zip
*.com
*.class
*.dll
*.exe
*.o
*.seed
*.so
*.swo
*.swp
*.swn
*.swm
*.out
*.pid


############################
# Logs and databases
############################

.tmp
*.log
*.sql
*.sqlite


############################
# Misc.
############################

*#
.idea
nbproject
.vscode/


############################
# Node.js
############################

lib-cov
lcov.info
pids
logs
results
build
node_modules
.node_history
package-lock.json
**/package-lock.json
!docs/package-lock.json
*.heapsnapshot


############################
# Tests
############################

testApp
coverage
cypress/screenshots
cypress/videos


############################
# Documentation
############################

dist

############################
# Builds
############################

packages/strapi-generate-new/files/public/

############################
# Example app
############################

.dev
# *.cache

############################
# Visual Studio Code
############################

front-workspace.code-workspace
4 changes: 4 additions & 0 deletions options/gitignore/TeX
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ acs-*.bib

# gregoriotex
*.gaux
*.glog
*.gtex

# htlatex
Expand Down Expand Up @@ -166,6 +167,9 @@ _minted*
# morewrites
*.mw

# newpax
*.newpax

# nomencl
*.nlg
*.nlo
Expand Down
25 changes: 25 additions & 0 deletions options/gitignore/TwinCAT3
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# gitignore template for TwinCAT3
# website: https://www.beckhoff.com/twincat3/
#
# Recommended: VisualStudio.gitignore

# TwinCAT files
*.tpy
*.tclrs
*.compiled-library
*.compileinfo
# Don't include the tmc-file rule if either of the following is true:
# 1. You've got TwinCAT C++ projects, as the information in the TMC-file is created manually for the C++ projects (in that case, only (manually) ignore the tmc-files for the PLC projects)
# 2. You've created a standalone PLC-project and added events to it, as these are stored in the TMC-file.
*.tmc
*.tmcRefac
*.library
*.project.~u
*.tsproj.bak
*.xti.bak
LineIDs.dbg
LineIDs.dbg.bak
_Boot/
_CompileInfo/
_Libraries/
_ModuleInstall/
14 changes: 14 additions & 0 deletions options/gitignore/V
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
*
!*/
!*.*
*.exe
*.o
*.so
*.tmp.c
*.exp
*.ilk
*.pdb
*.dll
*.lib
*.bak
*.out
26 changes: 26 additions & 0 deletions options/gitignore/VisualStudio
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ StyleCopReport.xml
*.tmp_proj
*_wpftmp.csproj
*.log
*.tlog
*.vspscc
*.vssscc
.builds
Expand Down Expand Up @@ -205,6 +206,9 @@ PublishScripts/
*.nuget.props
*.nuget.targets

# Nuget personal access tokens and Credentials
nuget.config

# Microsoft Azure Build Output
csx/
*.build.csdef
Expand Down Expand Up @@ -360,3 +364,25 @@ MigrationBackup/

# Fody - auto-generated XML schema
FodyWeavers.xsd

# VS Code files for those working on multiple tools
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace

# Local History for Visual Studio Code
.history/

# Windows Installer files from build outputs
*.cab
*.msi
*.msix
*.msm
*.msp

# JetBrains Rider
.idea/
*.sln.iml
2 changes: 1 addition & 1 deletion options/license/0BSD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (C) 2006 by Rob Landley <rob@landley.net>
Copyright (C) YEAR by AUTHOR EMAIL

Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted.

Expand Down
16 changes: 16 additions & 0 deletions options/license/BSD-3-Clause-No-Military-License
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
Copyright (c) year copyright holder. All Rights Reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1.
Redistribution of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2.
Redistribution in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3.
Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED, LICENSED OR INTENDED FOR USE IN THE DESIGN, CONSTRUCTION, OPERATION OR MAINTENANCE OF ANY MILITARY FACILITY.
5 changes: 5 additions & 0 deletions options/license/CAL-1.0
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ Code corresponding to the modifications in the Modified Work must be
provided to the Recipient either a) under this License, or b) under a
Compatible Open Source License.

A “Compatible Open Source License” means a license accepted by the Open Source
Initiative that allows object code created using both Source Code provided under
this License and Source Code provided under the other open source license to be
distributed together as a single work.

#### 4.1.3. Coordinated Disclosure of Security Vulnerabilities

You may delay providing the Source Code corresponding to a particular
Expand Down
Loading

0 comments on commit ffe6a4d

Please sign in to comment.