Compare commits

...

2 Commits

12 changed files with 114 additions and 8 deletions

View File

@@ -63,11 +63,109 @@ jobs:
continue-on-error: true
working-directory: ${{ github.workspace }}
run: |
set +e
curl -LJO https://github.com/OrcaSlicer/OrcaSlicer/releases/download/nightly-builds/orca_custom_preset_tests.zip
unzip -q ./orca_custom_preset_tests.zip -d ${{ github.workspace }}/resources/profiles
./OrcaSlicer_profile_validator -p ${{ github.workspace }}/resources/profiles -l 2 2>&1 | tee ${{ runner.temp }}/validate_custom.log
exit ${PIPESTATUS[0]}
fixtures_dir="${{ runner.temp }}/profile-fixtures"
output_dir="${{ runner.temp }}/custom-preset-validation"
combined_log="${{ runner.temp }}/validate_custom.log"
summary="${output_dir}/summary.md"
release_url="https://github.com/OrcaSlicer/OrcaSlicer-profile-validator/releases/download/fixture-archive"
rm -rf "${fixtures_dir}" "${output_dir}"
mkdir -p "${fixtures_dir}" "${output_dir}"
curl -fsSL -o "${fixtures_dir}/manifest.json" "${release_url}/manifest.json"
MANIFEST_PATH="${fixtures_dir}/manifest.json" python3 <<'PY' > "${fixtures_dir}/fixtures.tsv"
import json
import os
with open(os.environ["MANIFEST_PATH"], encoding="utf-8") as fh:
manifest = json.load(fh)
if isinstance(manifest, dict):
entries = manifest.get("fixtures", [])
else:
entries = manifest
for entry in entries:
version = entry.get("version", "")
asset = entry.get("asset", "")
sha256 = entry.get("asset_sha256", "")
if not version or not asset:
continue
print(f"{version}\t{asset}\t{sha256}")
PY
if [ ! -s "${fixtures_dir}/fixtures.tsv" ]; then
echo "No custom preset fixtures found in ${release_url}/manifest.json" | tee "${combined_log}"
exit 1
fi
{
echo "## Custom Preset Fixture Validation"
echo ""
echo "| Version | Status | Log |"
echo "| --- | --- | --- |"
} > "${summary}"
status=0
failed_logs=()
while IFS=$'\t' read -r version asset expected_sha256; do
fixture_zip="${fixtures_dir}/${asset}"
asset_url_name="$(python3 -c 'import sys, urllib.parse; print(urllib.parse.quote(sys.argv[1], safe=""))' "${asset}")"
profile_tree="${output_dir}/profiles-${version}"
log_path="${output_dir}/${version}.log"
curl -fsSL -o "${fixture_zip}" "${release_url}/${asset_url_name}"
if [ -n "${expected_sha256}" ] && [ "${expected_sha256}" != "<sha256>" ]; then
echo "${expected_sha256} ${fixture_zip}" | sha256sum -c -
fi
rm -rf "${profile_tree}"
mkdir -p "${profile_tree}"
cp -a "${{ github.workspace }}/resources/profiles/." "${profile_tree}/"
rm -rf "${profile_tree}/user"
unzip -q "${fixture_zip}" -d "${profile_tree}"
set +e
./OrcaSlicer_profile_validator -p "${profile_tree}" -l 2 > "${log_path}" 2>&1
result=$?
set -e
if [ "${result}" -eq 0 ]; then
echo "| ${version} | PASS | ${version}.log |" >> "${summary}"
else
echo "| ${version} | FAIL | ${version}.log |" >> "${summary}"
failed_logs+=("${log_path}")
status=1
fi
done < "${fixtures_dir}/fixtures.tsv"
{
cat "${summary}"
if [ "${#failed_logs[@]}" -gt 0 ]; then
echo ""
echo "## Failed Fixture Logs"
for log_path in "${failed_logs[@]}"; do
echo ""
echo "### $(basename "${log_path}" .log)"
echo '```'
head -c 12000 "${log_path}" || echo "No output captured"
echo '```'
done
fi
} | tee "${combined_log}"
exit "${status}"
- name: Upload custom preset validation logs
if: ${{ always() }}
uses: actions/upload-artifact@v7
with:
name: custom-preset-validation-logs
path: ${{ runner.temp }}/custom-preset-validation/
retention-days: 7
- name: Prepare PR number for comment workflow
if: ${{ always() && github.event_name == 'pull_request' }}

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL A1",
"renamed_from": "Panchroma PLA Stain @BBL A1",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_00",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL A1M",
"renamed_from": "Panchroma PLA Stain @BBL A1M",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_02",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL P1P",
"renamed_from": "Panchroma PLA Stain @BBL P1P",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_04",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Panchroma PLA Satin @BBL X1",
"renamed_from": "Panchroma PLA Stain @BBL X1",
"inherits": "Panchroma PLA Satin @base",
"from": "system",
"setting_id": "GFSPM005_06",

View File

@@ -1,6 +1,7 @@
{
"type": "process",
"name": "0.20mm Standard @BBL X1C",
"renamed_from": "0.20mm Bambu Support W @BBL X1C",
"inherits": "fdm_process_single_0.20",
"from": "system",
"setting_id": "GP004",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Ginger Generic PETG",
"renamed_from": "Ginger Generic rPETG",
"inherits": "fdm_filament_common",
"from": "system",
"setting_id": "ue95N2e65rdp5K6c",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Ginger Generic PLA",
"renamed_from": "Ginger Generic rPLA",
"inherits": "fdm_filament_common",
"from": "system",
"setting_id": "Z1scjKDBFoDaTa2C",

View File

@@ -1,6 +1,7 @@
{
"type": "filament",
"name": "Bambu PLA Impact @System",
"renamed_from": "Bambu PLA Impact @BBL X1C",
"inherits": "Bambu PLA Impact @base",
"from": "system",
"setting_id": "1qdr65SvIErZzxN3",

View File

@@ -18,5 +18,5 @@
"5"
],
"compatible_printers": [],
"renamed_from": "Elegoo PETG PRO"
"renamed_from": "Elegoo PETG PRO;Elegoo PETG Pro @System"
}

View File

@@ -33,5 +33,5 @@
"250"
],
"compatible_printers": [],
"renamed_from": "Elegoo Rapid PETG;Elegoo Rapid PETG+"
"renamed_from": "Elegoo Rapid PETG;Elegoo Rapid PETG+;Elegoo RAPID PETG;Elegoo RAPID PETG+"
}

View File

@@ -45,5 +45,5 @@
"; filament start gcode\n{if (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
],
"compatible_printers": [],
"renamed_from": "Elegoo Rapid PLA+"
"renamed_from": "Elegoo Rapid PLA+;Elegoo RAPID PLA+"
}