Skip to content

Commit 19ab07e

Browse files
garrettsummerfi3ldgarrettsummerfi3ld
authored
Merge pull request #8 from REVrobotics/prs-to-unofficial-rev-port/include-static-artifacts
Include both static and shared WPILib artifacts
2 parents 295cd9a + ba7d894 commit 19ab07e

File tree

1 file changed

+64
-38
lines changed

1 file changed

+64
-38
lines changed

‎.github/workflows/build.yml

+64-38
Original file line numberDiff line numberDiff line change
@@ -54,25 +54,35 @@ jobs:
5454
run : |
5555
halVersion=$(cat wpiHalVersion.txt)
5656
57-
halPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
58-
utilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
59-
60-
curl -o halPlatform.zip "$halPlatformUrl"
61-
curl -o utilPlatform.zip "$utilPlatformUrl"
57+
sharedHalPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
58+
sharedUtilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
59+
curl -L -o sharedHalPlatform.zip "$sharedHalPlatformUrl"
60+
curl -L -o sharedUtilPlatform.zip "$sharedUtilPlatformUrl"
61+
62+
staticHalPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}static.zip
63+
staticUtilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}static.zip
64+
curl -L -o staticHalPlatform.zip "$staticHalPlatformUrl"
65+
curl -L -o staticUtilPlatform.zip "$staticUtilPlatformUrl"
6266
6367
- name: Unzip WPILib HAL artifacts and headers
6468
run: |
65-
unzip halPlatform.zip -d halPlatform
66-
unzip utilPlatform.zip -d utilPlatform
67-
mkdir -p CANBridge-artifacts
69+
unzip sharedHalPlatform.zip -d sharedHalPlatform
70+
unzip sharedUtilPlatform.zip -d sharedUtilPlatform
71+
unzip staticHalPlatform.zip -d staticHalPlatform
72+
unzip staticUtilPlatform.zip -d staticUtilPlatform
73+
mkdir -p CANBridge-artifacts/static
74+
mkdir -p CANBridge-artifacts/shared
6875
6976
# Put Linux ARM release files together in one directory
7077
- name: Create Artifact
7178
run: |
72-
cp build/libs/cANBridge/static/release/libCANBridge.a CANBridge-artifacts/libCANBridge.a
73-
cp build/libs/cANBridge/shared/release/libCANBridge.so CANBridge-artifacts/libCANBridge.so
74-
cp halPlatform/linux/${{ matrix.arch }}/shared/libwpiHal.so CANBridge-artifacts/libwpiHal.so
75-
cp utilPlatform/linux/${{ matrix.arch }}/shared/libwpiutil.so CANBridge-artifacts/libwpiutil.so
79+
cp build/libs/cANBridge/shared/release/libCANBridge.so CANBridge-artifacts/shared/libCANBridge.so
80+
cp sharedHalPlatform/linux/${{ matrix.arch }}/shared/libwpiHal.so CANBridge-artifacts/shared/libwpiHal.so
81+
cp sharedUtilPlatform/linux/${{ matrix.arch }}/shared/libwpiutil.so CANBridge-artifacts/shared/libwpiutil.so
82+
83+
cp build/libs/cANBridge/static/release/libCANBridge.a CANBridge-artifacts/static/libCANBridge.a
84+
cp staticHalPlatform/linux/${{ matrix.arch }}/static/libwpiHal.a CANBridge-artifacts/static/libwpiHal.a
85+
cp staticUtilPlatform/linux/${{ matrix.arch }}/static/libwpiutil.a CANBridge-artifacts/static/libwpiutil.a
7686
7787
# Upload build artifact
7888
- name: Upload build artifact
@@ -125,40 +135,56 @@ jobs:
125135
run : |
126136
halVersion=$(cat wpiHalVersion.txt)
127137
128-
halPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
129-
utilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
130-
131-
curl -o halPlatform.zip "$halPlatformUrl"
132-
curl -o utilPlatform.zip "$utilPlatformUrl"
138+
sharedHalPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
139+
sharedUtilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}.zip
140+
curl -L -o sharedHalPlatform.zip "$sharedHalPlatformUrl"
141+
curl -L -o sharedUtilPlatform.zip "$sharedUtilPlatformUrl"
142+
143+
staticHalPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-${{ matrix.platform-type }}static.zip
144+
staticUtilPlatformUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-${{ matrix.platform-type }}static.zip
145+
curl -L -o staticHalPlatform.zip "$staticHalPlatformUrl"
146+
curl -L -o staticUtilPlatform.zip "$staticUtilPlatformUrl"
133147
134148
- name: Unzip WPILib HAL artifacts and headers
135149
run: |
136-
unzip halPlatform.zip -d halPlatform
137-
unzip utilPlatform.zip -d utilPlatform
138-
mkdir -p CANBridge-artifacts
150+
unzip sharedHalPlatform.zip -d sharedHalPlatform
151+
unzip sharedUtilPlatform.zip -d sharedUtilPlatform
152+
unzip staticHalPlatform.zip -d staticHalPlatform
153+
unzip staticUtilPlatform.zip -d staticUtilPlatform
154+
mkdir -p CANBridge-artifacts/static
155+
mkdir -p CANBridge-artifacts/shared
139156
140157
# Put release files together in one directory based on platform
141158
- name: Create Artifact
142159
run: |
143160
mkdir -p CANBridge-artifacts
144161
if [[ "${{ matrix.platform-type }}" == "windowsx86-64" ]]; then
145-
cp build/libs/cANBridge/static/windowsx86-64/release/CANBridge.lib CANBridge-artifacts/CANBridge-static.lib
146-
cp build/libs/cANBridge/shared/windowsx86-64/release/CANBridge.dll CANBridge-artifacts/CANBridge.dll
147-
cp build/libs/cANBridge/shared/windowsx86-64/release/CANBridge.lib CANBridge-artifacts/CANBridge.lib
148-
cp halPlatform/windows/x86-64/shared/wpiHal.dll CANBridge-artifacts/wpiHal.dll
149-
cp halPlatform/windows/x86-64/shared/wpiHal.lib CANBridge-artifacts/wpiHal.lib
150-
cp utilPlatform/windows/x86-64/shared/wpiutil.dll CANBridge-artifacts/wpiutil.dll
151-
cp utilPlatform/windows/x86-64/shared/wpiutil.lib CANBridge-artifacts/wpiutil.lib
162+
cp build/libs/cANBridge/shared/windowsx86-64/release/CANBridge.dll CANBridge-artifacts/shared/
163+
cp build/libs/cANBridge/shared/windowsx86-64/release/CANBridge.lib CANBridge-artifacts/shared/
164+
cp sharedHalPlatform/windows/x86-64/shared/wpiHal.dll CANBridge-artifacts/shared/
165+
cp sharedHalPlatform/windows/x86-64/shared/wpiHal.lib CANBridge-artifacts/shared/
166+
cp sharedUtilPlatform/windows/x86-64/shared/wpiutil.dll CANBridge-artifacts/shared/
167+
cp sharedUtilPlatform/windows/x86-64/shared/wpiutil.lib CANBridge-artifacts/shared/
168+
169+
cp build/libs/cANBridge/static/windowsx86-64/release/CANBridge.lib CANBridge-artifacts/static/
170+
cp staticHalPlatform/windows/x86-64/static/wpiHal.lib CANBridge-artifacts/static/
171+
cp staticUtilPlatform/windows/x86-64/static/wpiutil.lib CANBridge-artifacts/static/
152172
elif [[ "${{ matrix.platform-type }}" == "linuxx86-64" ]]; then
153-
cp build/libs/cANBridge/static/linuxx86-64/release/libCANBridge.a CANBridge-artifacts/libCANBridge.a
154-
cp build/libs/cANBridge/shared/linuxx86-64/release/libCANBridge.so CANBridge-artifacts/libCANBridge.so
155-
cp halPlatform/linux/x86-64/shared/libwpiHal.so CANBridge-artifacts/libwpiHal.so
156-
cp utilPlatform/linux/x86-64/shared/libwpiutil.so CANBridge-artifacts/libwpiutil.so
173+
cp build/libs/cANBridge/shared/linuxx86-64/release/libCANBridge.so CANBridge-artifacts/shared/
174+
cp sharedHalPlatform/linux/x86-64/shared/libwpiHal.so CANBridge-artifacts/shared/
175+
cp sharedUtilPlatform/linux/x86-64/shared/libwpiutil.so CANBridge-artifacts/shared/
176+
177+
cp build/libs/cANBridge/static/linuxx86-64/release/libCANBridge.a CANBridge-artifacts/static/
178+
cp staticHalPlatform/linux/x86-64/static/libwpiHal.a CANBridge-artifacts/static/
179+
cp staticUtilPlatform/linux/x86-64/static/libwpiutil.a CANBridge-artifacts/static/
157180
elif [[ "${{ matrix.platform-type }}" == "osxuniversal" ]]; then
158-
cp build/libs/cANBridge/static/osxuniversal/release/libCANBridge.a CANBridge-artifacts/libCANBridge.a
159-
cp build/libs/cANBridge/shared/osxuniversal/release/libCANBridge.dylib CANBridge-artifacts/libCANBridge.dylib
160-
cp halPlatform/osx/universal/shared/libwpiHal.dylib CANBridge-artifacts/libwpiHal.dylib
161-
cp utilPlatform/osx/universal/shared/libwpiutil.dylib CANBridge-artifacts/libwpiutil.dylib
181+
cp build/libs/cANBridge/shared/osxuniversal/release/libCANBridge.dylib CANBridge-artifacts/shared/
182+
cp sharedHalPlatform/osx/universal/shared/libwpiHal.dylib CANBridge-artifacts/shared/
183+
cp sharedUtilPlatform/osx/universal/shared/libwpiutil.dylib CANBridge-artifacts/shared
184+
185+
cp build/libs/cANBridge/static/osxuniversal/release/libCANBridge.a CANBridge-artifacts/static/
186+
cp staticHalPlatform/osx/universal/static/libwpiHal.a CANBridge-artifacts/static/
187+
cp staticUtilPlatform/osx/universal/static/libwpiutil.a CANBridge-artifacts/static/
162188
fi
163189
164190
# Upload build artifact
@@ -184,8 +210,8 @@ jobs:
184210
halHeadersUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/hal/hal-cpp/"$halVersion"/hal-cpp-"$halVersion"-headers.zip
185211
utilHeadersUrl=https://frcmaven.wpi.edu/artifactory/release/edu/wpi/first/wpiutil/wpiutil-cpp/"$halVersion"/wpiutil-cpp-"$halVersion"-headers.zip
186212
187-
curl -o halHeaders.zip "$halHeadersUrl"
188-
curl -o utilHeaders.zip "$utilHeadersUrl"
213+
curl -L -o halHeaders.zip "$halHeadersUrl"
214+
curl -L -o utilHeaders.zip "$utilHeadersUrl"
189215
190216
- name: Unzip WPILib HAL artifacts and headers
191217
run: |
@@ -233,4 +259,4 @@ jobs:
233259
uses: actions/upload-artifact@v4
234260
with:
235261
name: version
236-
path: build/allOutputs/version.txt
262+
path: build/allOutputs/version.txt

0 commit comments

Comments
 (0)