Skip to content

Commit 04c164d

Browse files
committed
Cleaned up actions with simpler install commands
1 parent c3ac57c commit 04c164d

File tree

2 files changed

+7
-25
lines changed

2 files changed

+7
-25
lines changed

.github/workflows/build-and-publish.yaml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@ jobs:
3636
git reset --hard origin/main
3737
popd
3838
39-
- name: Set up Python
40-
uses: actions/setup-python@v4
41-
with:
42-
python-version: ${{ matrix.python-version }}
43-
4439
- name: Install .NET 8 (Windows only)
4540
if: matrix.os == 'windows-latest'
4641
uses: actions/setup-dotnet@v3
4742
with:
4843
dotnet-version: '8.0.x'
4944

50-
- name: Install uv
45+
- name: Install uv and set the python version
5146
uses: astral-sh/setup-uv@v5
5247
with:
5348
python-version: ${{ matrix.python-version }}

.github/workflows/run-all-tests.yml

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -25,30 +25,17 @@ jobs:
2525
persist-credentials: true
2626
token: ${{ secrets.GITHUB_TOKEN }}
2727

28-
- name: Sync and update FracturedJson submodule to tip of main
28+
- name: Sync and update FracturedJson submodule
2929
run: |
3030
set -euo pipefail
31-
# Ensure .gitmodules remotes are in sync and initialize submodules
3231
git submodule sync --recursive
3332
git submodule update --init --recursive
33+
pushd FracturedJson
34+
git fetch --no-tags origin main
35+
git checkout -B main origin/main
36+
git reset --hard origin/main
37+
popd
3438
35-
# Force FracturedJson to origin/main (robust for shallow clones)
36-
if [ -d "FracturedJson" ]; then
37-
pushd FracturedJson
38-
git fetch --no-tags origin main
39-
if git rev-parse --verify origin/main >/dev/null 2>&1; then
40-
git checkout -B main origin/main
41-
git reset --hard origin/main
42-
else
43-
echo "ERROR: origin/main not found for FracturedJson"
44-
git show-ref || true
45-
exit 1
46-
fi
47-
popd
48-
else
49-
echo "ERROR: FracturedJson directory not found after init"
50-
exit 1
51-
fi
5239
5340
- name: Install uv and set the python version
5441
uses: astral-sh/setup-uv@v5

0 commit comments

Comments
 (0)