Skip to content

Commit cd1a275

Browse files
authored
Merge pull request #78 from mailmindlin/main
Expose WPIStruct for Twist3d
2 parents 58d5646 + 2bc87c0 commit cd1a275

File tree

2 files changed

+14
-18
lines changed

2 files changed

+14
-18
lines changed

.github/workflows/dist.yml

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,23 @@ jobs:
8787
# Setup build caching
8888
#
8989

90-
- name: Set ccache variant
90+
- name: Set ccache size
9191
shell: bash
9292
id: ccache
9393
run: |
9494
if [[ "${{ runner.os }}" == "Windows" ]]; then
95-
echo "VARIANT=sccache" >> $GITHUB_OUTPUT
96-
echo "RPYBUILD_CC_LAUNCHER=sccache" >> $GITHUB_ENV
95+
echo "MAX_SIZE=1200M" >> $GITHUB_OUTPUT
9796
else
98-
echo "VARIANT=ccache" >> $GITHUB_OUTPUT
99-
echo "RPYBUILD_CC_LAUNCHER=ccache" >> $GITHUB_ENV
97+
echo "MAX_SIZE=500M" >> $GITHUB_OUTPUT
10098
fi
10199
102100
- name: Setup ccache
103-
if: steps.ccache.outputs.variant == 'ccache'
104-
uses: hendrikmuhs/ccache-action@v1.2.10
101+
# uses: hendrikmuhs/ccache[email protected]
102+
uses: robotpy/ccache-action@fork
105103
with:
106104
key: ${{ matrix.os }}-${{ matrix.python_version }}
107105
variant: ccache
108-
109-
- name: Setup sccache
110-
if: steps.ccache.outputs.variant == 'sccache'
111-
uses: mozilla-actions/[email protected]
106+
max-size: ${{ steps.ccache.outputs.max_size }}
112107

113108
- name: Install deps
114109
shell: bash
@@ -126,7 +121,7 @@ jobs:
126121
./rdev.sh ci run
127122
env:
128123
RPYBUILD_STRIP_LIBPYTHON: "1"
129-
SCCACHE_GHA_ENABLED: "true"
124+
RPYBUILD_CC_LAUNCHER: ccache
130125

131126
- uses: actions/upload-artifact@v3
132127
with:
@@ -177,11 +172,6 @@ jobs:
177172
with:
178173
fetch-depth: 0
179174

180-
- name: Set ccache env
181-
shell: bash
182-
run: |
183-
echo "RPYBUILD_CC_LAUNCHER=ccache" >> $GITHUB_ENV
184-
185175
- run: apt-get update
186176
- name: Setup ccache
187177
uses: hendrikmuhs/[email protected]
@@ -214,6 +204,7 @@ jobs:
214204
/build/venv/bin/cross-python -m devtools ci run --no-test
215205
env:
216206
RPYBUILD_STRIP_LIBPYTHON: "1"
207+
RPYBUILD_CC_LAUNCHER: ccache
217208

218209
- uses: actions/upload-artifact@v3
219210
with:

subprojects/robotpy-wpimath/gen/geometry/Twist3d.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
---
22

3+
extra_includes:
4+
- wpystruct.h
5+
36
classes:
47
Twist3d:
58
force_no_default_constructor: true
@@ -86,4 +89,6 @@ inline_code: |
8689
"ry=" + std::to_string(tw.ry()) + ", "
8790
"rz=" + std::to_string(tw.rz()) + ")";
8891
})
89-
;
92+
;
93+
94+
SetupWPyStruct<frc::Twist3d>(cls_Twist3d);

0 commit comments

Comments
 (0)