Skip to content

Commit 087eed4

Browse files
authored
Merge pull request #569 from treeform/modernize-pixie
Modernize project structure
2 parents 6d47166 + d860486 commit 087eed4

6 files changed

Lines changed: 57 additions & 36 deletions

File tree

.github/workflows/build.yml

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
name: Github Actions
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches: [ master ]
5+
pull_request:
6+
branches: [ master ]
7+
workflow_dispatch:
38
jobs:
49
build:
510
strategy:
611
fail-fast: false
712
matrix:
8-
os: [ubuntu-latest, windows-latest]
9-
nim-version: ['1.4.x', 'stable']
10-
13+
os: [ubuntu-latest, windows-latest, macos-latest]
1114
runs-on: ${{ matrix.os }}
12-
1315
steps:
14-
- uses: actions/checkout@v3
15-
- uses: jiro4989/setup-nim-action@v2
16-
with:
17-
nim-version: ${{ matrix.nim-version }}
18-
repo-token: ${{ secrets.GITHUB_TOKEN }}
19-
- run: nimble test --gc:arc -d:release -y
20-
- run: nimble test --gc:arc -d:release -d:pixieNoSimd -y
21-
- run: nimble test --gc:orc -d:release -y
22-
- run: nim cpp --gc:orc -d:release -r tests/all.nim
16+
- uses: actions/checkout@v5
17+
- uses: treeform/setup-nim-action@v6
18+
- name: Install dependencies
19+
shell: bash
20+
run: |
21+
cd ..
22+
nimby install -g pixie/pixie.nimble
23+
- run: nim r tests/tests.nim

.github/workflows/docs.yml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,25 @@ on:
33
push:
44
branches:
55
- master
6+
workflow_dispatch:
7+
permissions:
8+
contents: write
69
env:
7-
nim-version: 'stable'
8-
nim-src: src/${{ github.event.repository.name }}.nim
10+
nim-src: src/pixie.nim
911
deploy-dir: .gh-pages
1012
jobs:
1113
docs:
1214
runs-on: ubuntu-latest
1315
steps:
14-
- uses: actions/checkout@v3
15-
- uses: jiro4989/setup-nim-action@v1
16-
with:
17-
nim-version: ${{ env.nim-version }}
18-
- run: nimble install -Y
19-
- run: nimble doc --index:on --project --git.url:https://github.com/${{ github.repository }} --git.commit:master --out:${{ env.deploy-dir }} ${{ env.nim-src }}
20-
- name: "Copy to index.html"
21-
run: cp ${{ env.deploy-dir }}/${{ github.event.repository.name }}.html ${{ env.deploy-dir }}/index.html
16+
- uses: actions/checkout@v5
17+
- uses: treeform/setup-nim-action@v6
18+
- name: Install dependencies
19+
run: |
20+
cd ..
21+
nimby install -g pixie/pixie.nimble
22+
- run: nim doc --index:on --project --git.url:https://github.com/${{ github.repository }} --git.commit:master --out:${{ env.deploy-dir }} ${{ env.nim-src }}
23+
- name: Copy to index.html
24+
run: cp ${{ env.deploy-dir }}/pixie.html ${{ env.deploy-dir }}/index.html
2225
- name: Deploy documents
2326
uses: peaceiris/actions-gh-pages@v3
2427
with:

.gitignore

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,23 @@
1-
# ignore files with no extention:
1+
# Ignore files with no extention.
22
*
33
!*/
44
!*.*
5+
!LICENSE
56

6-
# normal ignores:
7+
# Ignore hidden files, but not the license or github files.
8+
.*
9+
!.github/
10+
!.github/**
11+
!.gitignore
12+
13+
# Normal ignores.
714
*.exe
815
nimcache
916
*.pdb
1017
*.ilk
11-
.*
18+
*.out
19+
20+
# Project specific ignores.
1221
*.dll
1322
__pycache__
1423
bindings/generated
@@ -17,4 +26,4 @@ dump.txt
1726
tests/fileformats/jpeg/generated
1827
tests/fileformats/jpeg/diffs
1928
*.dylib
20-
tmp
29+
tmp/

README.md

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,28 @@
22

33
👏 👏 👏 Check out video about the library: [A full-featured 2D graphics library for Nim (NimConf 2021)](https://www.youtube.com/watch?v=8acDfUIwLnk) 👏 👏 👏
44

5-
# Pixie - A full-featured 2D graphics library for Nim
5+
# Pixie - A full-featured 2D graphics library for Nim.
66

77
Pixie is a 2D graphics library similar to [Cairo](https://www.cairographics.org/) and [Skia](https://skia.org) written entirely in Nim.
88

99
This library is being actively developed and we'd be happy for you to use it.
1010

11-
`nimble install pixie`
11+
`nimby install pixie`
1212

1313
![Github Actions](https://github.com/treeform/pixie/workflows/Github%20Actions/badge.svg)
14+
![GitHub release (latest by date)](https://img.shields.io/github/v/release/treeform/pixie)
15+
![GitHub Repo stars](https://img.shields.io/github/stars/treeform/pixie)
16+
![GitHub](https://img.shields.io/github/license/treeform/pixie)
17+
![GitHub issues](https://img.shields.io/github/issues/treeform/pixie)
1418

1519
[API reference](https://treeform.github.io/pixie)
1620

1721
[Pixie Book](https://github.com/treeform/pixiebook)
1822

23+
## About
24+
25+
Pixie includes CPU rasterization, image codecs, text layout, paths, paints, masking, blending, and SIMD-accelerated operations.
26+
1927
### Videos
2028

2129
* [Pixie 5.0 performance improvements](https://www.youtube.com/watch?v=Did21OYIrGI)
@@ -111,7 +119,7 @@ To learn how to use Pixie for realtime graphics with GPU, check out [Boxy](https
111119

112120
## Testing
113121

114-
`nimble test`
122+
`nim r tests/tests.nim`
115123

116124
## Examples
117125

pixie.nimble

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ license = "MIT"
55

66
srcDir = "src"
77

8-
requires "nim >= 1.4.8"
8+
requires "nim >= 2.0.0"
99
requires "vmath >= 3.0.0"
10-
requires "chroma >= 0.2.6"
11-
requires "zippy >= 0.10.3"
10+
requires "chroma >= 1.0.0"
11+
requires "zippy >= 0.10.16"
1212
requires "flatty >= 0.3.4"
13-
requires "nimsimd >= 1.2.4"
13+
requires "nimsimd >= 1.3.2"
1414
requires "bumpy >= 1.1.3"
15-
requires "crunchy >= 0.1.0"
15+
requires "crunchy >= 0.1.11"
1616

1717
task bindings, "Generate bindings":
1818

File renamed without changes.

0 commit comments

Comments
 (0)