Skip to content

Commit 069f7b0

Browse files
ctreffsctreffs
authored
Merge pull request #8 from ctreffs/update-5.2
Update to Assimp 5.2.0
2 parents 134effc + 3ef9fee commit 069f7b0

39 files changed

+1598
-969
lines changed

‎.github/FUNDING.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: [ctreffs]
2+
custom: ['https://www.paypal.com/donate?hosted_button_id=GCG3K54SKRALQ']

‎.github/ISSUE_TEMPLATE/BUG_REPORT.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
name: 🐛 Bug Report
3+
about: Something isn't working as expected, create a report to help us improve
4+
labels: bug
5+
---
6+
7+
<!--
8+
Thanks for contributing to this project!
9+
10+
Before you submit your issue, please replace each paragraph
11+
below with the relevant details for your bug, and complete
12+
the steps in the checklist by placing an 'x' in each box:
13+
14+
- [x] I've completed this task
15+
- [ ] This task isn't completed
16+
-->
17+
18+
### Bug Description
19+
20+
*A clear and concise description of what the bug is.
21+
Replace this paragraph with a short description of the incorrect behavior.
22+
(If this is a regression, please note the last version of the package that exhibited the correct behavior in addition to your current version.)*
23+
24+
### Information
25+
26+
- **Package version:** What tag or branch of this package are you using? e.g. tag `1.2.3` or branch `main`
27+
- **Platform version:** Please tell us the version number of your operating system. e.g. `macOS 11.2.3` or `Ubuntu 20.04`
28+
- **Swift version:** Paste the output of `swift --version` here.
29+
30+
### Checklist
31+
32+
- [ ] If possible, I've reproduced the issue using the `main`/`master` branch of this package.
33+
- [ ] I've searched for existing issues under the issues tab.
34+
- [ ] The bug is reproducible
35+
36+
### Steps to Reproduce
37+
38+
*Steps to reproduce the behavior:*
39+
40+
1. Go to '...'
41+
2. '....'
42+
43+
*Replace this paragraph with an explanation of how to reproduce the incorrect behavior.
44+
Include a simple code example, if possible.*
45+
46+
### Expected behavior
47+
48+
*A clear and concise description of what you expected to happen.
49+
Describe what you expect to happen.*
50+
51+
### Actual behavior
52+
53+
*Describe or copy/paste the behavior you observe.*
54+
55+
### Screenshots
56+
57+
If applicable, add screenshots to help explain your problem.
58+
59+
### Additional context
60+
61+
*Add any other context about the problem here.*

‎.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
---
2+
name: 💡 Feature Request
3+
about: A suggestion for a new feature or idea for this project
4+
labels: enhancement
5+
---
6+
7+
<!--
8+
Thanks for contributing to this project!
9+
10+
Before you submit your issue, please replace the paragraphs
11+
below with information about your proposed feature.
12+
-->
13+
14+
### Feature request
15+
16+
*Replace this paragraph with a description of your proposed feature.
17+
A clear and concise description of what the idea or problem is you want to solve.
18+
Please be sure to describe some concrete use cases for the new feature -- be as specific as possible.
19+
Provide links to existing issues or external references/discussions, if appropriate.*
20+
21+
### Describe the solution you'd like
22+
23+
*A clear and concise description of what you want to happen.*
24+
25+
### Describe alternatives you've considered
26+
27+
*A clear and concise description of any alternative solutions or features you've considered.*
28+
29+
### Additional context
30+
31+
*Add any other context or screenshots about the feature request here.*

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
blank_issues_enabled: false

‎.github/pull_request_template.md‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<!--
2+
Thanks for contributing to this project!
3+
4+
Before you submit your request, please replace each paragraph
5+
below with the relevant details, and complete the steps in the
6+
checklist by placing an 'x' in each box:
7+
8+
- [x] I've completed this task
9+
- [ ] This task isn't completed
10+
-->
11+
12+
### Description
13+
14+
*Replace this paragraph with a description of your changes and rationale.
15+
Provide links to an existing issue or external references/discussions, if appropriate.*
16+
17+
### Detailed Design
18+
19+
*Include any additional information about the design here. At minimum, describe a synopsis of any public API additions.*
20+
21+
```swift
22+
/// The new feature implemented by this pull request.
23+
public struct Example: Collection {
24+
}
25+
```
26+
27+
### Documentation
28+
29+
*How has the new feature been documented?
30+
Have the relevant portions of the guides in the Documentation folder been updated in addition to symbol-level documentation?*
31+
32+
### Testing
33+
34+
*How is the new feature tested?
35+
Please ensure CI is not broken*
36+
37+
### Performance
38+
39+
*How did you verify the new feature performs as expected?*
40+
41+
### Source Impact
42+
43+
*What is the impact of this change on existing users of this package? Does it deprecate or remove any existing API?*
44+
45+
### Checklist
46+
47+
- [ ] I've read the [Contribution Guidelines](https://github.com/ctreffs/SwiftAssimp/blob/master/CONTRIBUTING.md)
48+
- [ ] I've followed the coding style of the rest of the project.
49+
- [ ] I've added tests covering all new code paths my change adds to the project (to the extent possible).
50+
- [ ] I've added benchmarks covering new functionality (if appropriate).
51+
- [ ] I've verified that my change does not break any existing tests or introduce unexpected benchmark regressions.
52+
- [ ] I've updated the documentation (if appropriate).

‎.github/workflows/ci-linux.yml‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
name: Linux
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
linux-test-build-release:
11+
runs-on: ubuntu-latest
12+
strategy:
13+
matrix:
14+
swift: ["latest"]
15+
container:
16+
image: swift:${{ matrix.swift }}
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@master
20+
- name: Restore APT cache
21+
uses: actions/cache@v2
22+
with:
23+
path: /var/cache/apt
24+
key: ${{ runner.os }}-apt
25+
- name: Restore cached SPM dependencies
26+
uses: actions/cache@v2
27+
with:
28+
path: |
29+
.build/repositories
30+
key: ${{ runner.os }}-spm-repos-${{ hashFiles('**/Package.resolved') }}
31+
restore-keys: |
32+
${{ runner.os }}-spm-repos-
33+
- name: Install dependencies
34+
run: |
35+
# update dependency source list to more modern linux distribution
36+
# echo -e "deb http://archive.ubuntu.com/ubuntu focal main restricted universe multiverse" >> /etc/apt/sources.list
37+
apt update
38+
apt-get install -y -qq pkg-config libassimp-dev
39+
- name: Test
40+
run: make test
41+
- name: Build Release
42+
run: make build-release

‎.github/workflows/ci-macos.yml‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
name: macOS
2+
3+
on:
4+
push:
5+
branches: [ master ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
macos-test-build-release-xcode:
11+
runs-on: macOS-latest
12+
strategy:
13+
matrix:
14+
xcode: ["13.2.1"]
15+
steps:
16+
- name: Checkout
17+
uses: actions/checkout@master
18+
- name: Select Xcode ${{ matrix.xcode }}
19+
run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
20+
- name: Restore cached Homebrew dependencies
21+
uses: actions/cache@v2
22+
with:
23+
path: |
24+
~/Library/Caches/Homebrew/assimp--*
25+
~/Library/Caches/Homebrew/downloads/*--assimp-*
26+
key: ${{ runner.os }}-brew-assimp-${{ hashFiles('.github/brew-formulae') }}
27+
restore-keys: ${{ runner.os }}-brew-assimp-
28+
- name: Restore cached SPM dependencies
29+
uses: actions/cache@v2
30+
with:
31+
path: |
32+
.build/repositories
33+
key: ${{ runner.os }}-spm-repos-${{ hashFiles('**/Package.resolved') }}
34+
restore-keys: |
35+
${{ runner.os }}-spm-repos-
36+
- name: Install dependencies
37+
run: |
38+
brew install assimp
39+
- name: Test
40+
run: make test
41+
env:
42+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
43+
- name: Upload test artifacts
44+
if: failure()
45+
uses: actions/upload-artifact@v2.2.3
46+
with:
47+
name: test-artifacts-${{ matrix.xcode }}-${{ github.run_id }}
48+
path: |
49+
.build/**/*.json
50+
.build/**/*.xctest
51+
- name: Build Release
52+
run: make build-release
53+
env:
54+
DEVELOPER_DIR: /Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer
55+
- name: Upload build artifacts
56+
if: failure()
57+
uses: actions/upload-artifact@v2.2.3
58+
with:
59+
name: build-artifacts-${{ matrix.xcode }}-${{ github.run_id }}
60+
path: |
61+
*.lcov
62+
.build/*.yaml
63+
.build/**/*.a
64+
.build/**/*.so
65+
.build/**/*.dylib
66+
.build/**/*.dSYM
67+
.build/**/*.json

‎.github/workflows/markdown-link-check.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Check markdown links
2+
3+
on: push
4+
5+
jobs:
6+
markdown-link-check:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- name: Checkout
10+
uses: actions/checkout@master
11+
- name: markdown-link-check
12+
uses: gaurav-nelson/github-action-markdown-link-check@master
13+

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.swift-version‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)