Skip to content

Commit a31858e

Browse files
m-messerm-messer
authored
Merge pull request #3 from lambda-feedback/fix/ci-wolfram-license-activation
Stop depending on WolframResearch actions' hardcoded wolframengine image
2 parents 6db071b + 0b811d6 commit a31858e

2 files changed

Lines changed: 87 additions & 21 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,14 @@ on:
99

1010
env:
1111
RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
12-
WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
1312
WLPR_PACLET_SITE: https://resources.wolframcloud.com/PacletRepository/pacletsite
1413

1514
jobs:
1615
build:
1716
name: Build
1817
runs-on: ubuntu-latest
1918
container:
20-
image: wolframresearch/wolframengine:latest
19+
image: jonmcloone/wwe:LabJul1
2120
options: --user root
2221
env:
2322
WOLFRAM_SYSTEM_ID: Linux-x86-64
@@ -42,11 +41,29 @@ jobs:
4241
EOF
4342
fi
4443
44+
- name: Install build tooling
45+
run: |
46+
apt-get update && apt-get install -y --no-install-recommends git ca-certificates
47+
git clone --depth 1 --branch v0.36.0 https://github.com/WolframResearch/PacletCICD.git /tmp/PacletCICD
48+
git clone --depth 1 --branch v1.11.0 https://github.com/WolframResearch/build-paclet.git /tmp/build-paclet
49+
wolframscript -code 'PacletDirectoryAdd["/tmp/PacletCICD"]; Needs["Wolfram`PacletCICD`"]; Print["Loaded PacletCICD from: ", FindFile["Wolfram`PacletCICD`"]]'
50+
4551
- name: Build
46-
uses: WolframResearch/build-paclet@v1.11.0
47-
with:
48-
target: Build
49-
paclet_cicd_version: 0.36.0
52+
env:
53+
INPUT_TARGET: Build
54+
INPUT_CHECK: "true"
55+
INPUT_DEBUG: "false"
56+
INPUT_DEFINITION_NOTEBOOK: ./ResourceDefinition.nb
57+
INPUT_PACLET_CICD_VERSION: "0.36.0"
58+
INPUT_RESOURCE_SYSTEM_BASE: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
59+
run: |
60+
wolframscript -file /tmp/build-paclet/src/build_paclet.wls
61+
WS_EXIT_CODE=$?
62+
if [ "$WS_EXIT_CODE" -eq 139 ]; then
63+
echo "::warning::Warning: wolframscript did not exit cleanly"
64+
elif [ "$WS_EXIT_CODE" -ne 0 ]; then
65+
exit "$WS_EXIT_CODE"
66+
fi
5067
5168
- name: UploadArtifact
5269
uses: actions/upload-artifact@v4

‎.github/workflows/submit.yml‎

Lines changed: 64 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@ on:
88

99
env:
1010
RESOURCE_PUBLISHER_TOKEN: ${{ secrets.RESOURCE_PUBLISHER_TOKEN }}
11-
WOLFRAMSCRIPT_ENTITLEMENTID: ${{ secrets.WOLFRAMSCRIPT_ENTITLEMENTID }}
1211
WLPR_PACLET_SITE: https://resources.wolframcloud.com/PacletRepository/pacletsite
1312

1413
jobs:
1514
check:
1615
name: Check
1716
runs-on: ubuntu-latest
1817
container:
19-
image: wolframresearch/wolframengine:latest
18+
image: jonmcloone/wwe:LabJul1
2019
options: --user root
2120
env:
2221
WOLFRAM_SYSTEM_ID: Linux-x86-64
@@ -41,11 +40,28 @@ jobs:
4140
EOF
4241
fi
4342
43+
- name: Install build tooling
44+
run: |
45+
apt-get update && apt-get install -y --no-install-recommends git ca-certificates
46+
git clone --depth 1 --branch v0.36.0 https://github.com/WolframResearch/PacletCICD.git /tmp/PacletCICD
47+
git clone --depth 1 --branch v1.11.0 https://github.com/WolframResearch/check-paclet.git /tmp/check-paclet
48+
wolframscript -code 'PacletDirectoryAdd["/tmp/PacletCICD"]; Needs["Wolfram`PacletCICD`"]; Print["Loaded PacletCICD from: ", FindFile["Wolfram`PacletCICD`"]]'
49+
4450
- name: Check
45-
uses: WolframResearch/check-paclet@v1.11.0
46-
with:
47-
target: Submit
48-
paclet_cicd_version: 0.36.0
51+
env:
52+
INPUT_TARGET: Submit
53+
INPUT_DEBUG: "false"
54+
INPUT_DEFINITION_NOTEBOOK: ./ResourceDefinition.nb
55+
INPUT_PACLET_CICD_VERSION: "0.36.0"
56+
INPUT_RESOURCE_SYSTEM_BASE: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
57+
run: |
58+
wolframscript -file /tmp/check-paclet/src/check_paclet.wls
59+
WS_EXIT_CODE=$?
60+
if [ "$WS_EXIT_CODE" -eq 139 ]; then
61+
echo "::warning::Warning: wolframscript did not exit cleanly"
62+
elif [ "$WS_EXIT_CODE" -ne 0 ]; then
63+
exit "$WS_EXIT_CODE"
64+
fi
4965
5066
# - name: UploadWorkflowValues
5167
# if: always() && env.PACLET_WORKFLOW_VALUES
@@ -59,7 +75,7 @@ jobs:
5975
name: Test
6076
runs-on: ubuntu-latest
6177
container:
62-
image: wolframresearch/wolframengine:latest
78+
image: jonmcloone/wwe:LabJul1
6379
options: --user root
6480
env:
6581
WOLFRAM_SYSTEM_ID: Linux-x86-64
@@ -84,11 +100,28 @@ jobs:
84100
EOF
85101
fi
86102
103+
- name: Install build tooling
104+
run: |
105+
apt-get update && apt-get install -y --no-install-recommends git ca-certificates
106+
git clone --depth 1 --branch v0.36.0 https://github.com/WolframResearch/PacletCICD.git /tmp/PacletCICD
107+
git clone --depth 1 --branch v1.11.0 https://github.com/WolframResearch/test-paclet.git /tmp/test-paclet
108+
wolframscript -code 'PacletDirectoryAdd["/tmp/PacletCICD"]; Needs["Wolfram`PacletCICD`"]; Print["Loaded PacletCICD from: ", FindFile["Wolfram`PacletCICD`"]]'
109+
87110
- name: Test
88-
uses: WolframResearch/test-paclet@v1.11.0
89-
with:
90-
target: Submit
91-
paclet_cicd_version: 0.36.0
111+
env:
112+
INPUT_TARGET: Submit
113+
INPUT_DEBUG: "false"
114+
INPUT_DEFINITION_NOTEBOOK: ./ResourceDefinition.nb
115+
INPUT_PACLET_CICD_VERSION: "0.36.0"
116+
INPUT_RESOURCE_SYSTEM_BASE: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
117+
run: |
118+
wolframscript -file /tmp/test-paclet/src/test_paclet.wls
119+
WS_EXIT_CODE=$?
120+
if [ "$WS_EXIT_CODE" -eq 139 ]; then
121+
echo "::warning::Warning: wolframscript did not exit cleanly"
122+
elif [ "$WS_EXIT_CODE" -ne 0 ]; then
123+
exit "$WS_EXIT_CODE"
124+
fi
92125
93126
# - name: UploadWorkflowValues
94127
# if: always() && env.PACLET_WORKFLOW_VALUES
@@ -103,7 +136,7 @@ jobs:
103136
needs: [check, test]
104137
runs-on: ubuntu-latest
105138
container:
106-
image: wolframresearch/wolframengine:latest
139+
image: jonmcloone/wwe:LabJul1
107140
options: --user root
108141
env:
109142
WOLFRAM_SYSTEM_ID: Linux-x86-64
@@ -128,10 +161,26 @@ jobs:
128161
EOF
129162
fi
130163
164+
- name: Install build tooling
165+
run: |
166+
apt-get update && apt-get install -y --no-install-recommends git ca-certificates
167+
git clone --depth 1 --branch v0.36.0 https://github.com/WolframResearch/PacletCICD.git /tmp/PacletCICD
168+
git clone --depth 1 --branch v1.11.0 https://github.com/WolframResearch/submit-paclet.git /tmp/submit-paclet
169+
wolframscript -code 'PacletDirectoryAdd["/tmp/PacletCICD"]; Needs["Wolfram`PacletCICD`"]; Print["Loaded PacletCICD from: ", FindFile["Wolfram`PacletCICD`"]]'
170+
131171
- name: Submit
132-
uses: WolframResearch/submit-paclet@v1.11.0
133-
with:
134-
paclet_cicd_version: 0.36.0
172+
env:
173+
INPUT_DEFINITION_NOTEBOOK: ./ResourceDefinition.nb
174+
INPUT_PACLET_CICD_VERSION: "0.36.0"
175+
INPUT_RESOURCE_SYSTEM_BASE: https://www.wolframcloud.com/obj/resourcesystem/api/1.0
176+
run: |
177+
wolframscript -file /tmp/submit-paclet/src/submit_paclet.wls
178+
WS_EXIT_CODE=$?
179+
if [ "$WS_EXIT_CODE" -eq 139 ]; then
180+
echo "::warning::Warning: wolframscript did not exit cleanly"
181+
elif [ "$WS_EXIT_CODE" -ne 0 ]; then
182+
exit "$WS_EXIT_CODE"
183+
fi
135184
136185
- name: UploadArtifact
137186
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)