Skip to content

Commit 503c6d7

Browse files
committed
chore(ci): remove no longer needed conditions
These scripts were shared before, but they are now only in this repo, so remove conditions that made them compatible with others.
1 parent 530f38c commit 503c6d7

File tree

2 files changed

+7
-30
lines changed

2 files changed

+7
-30
lines changed

.github/workflows/uv-upgrade.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,28 +56,21 @@ jobs:
5656

5757
version: 0.9.29
5858
- name: Install apt dependencies
59-
run: |
60-
if [ -f ./ci/apt-install ] ; then
61-
sudo ./ci/apt-install
62-
fi
63-
59+
run: sudo ./ci/apt-install
6460

6561
- name: Lockfile maintenance
6662
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
6763
run: uv lock --upgrade
6864

6965
- run: uv sync --all-extras
7066
name: Update lock file
71-
if: hashFiles('uv.lock') != ''
7267

7368
- name: Update SBOM
74-
if: hashFiles('docs/specs/sbom/partial/python.json') != ''
7569
run: |
7670
uv export --preview-features sbom-export --format cyclonedx1.5 --all-extras --no-dev > docs/specs/sbom/partial/python.json
7771
./scripts/reproducible-sbom.py docs/specs/sbom/partial/python.json
7872
7973
- name: Merge SBOM
80-
if: hashFiles('docs/specs/sbom/partial/python.json') != ''
8174
env:
8275
# renovate: datasource=github-releases depName=CycloneDX/cyclonedx-cli versioning=loose
8376
CYCLONEDX_CLI_VERSION: v0.29.2

.github/workflows/yarn-update.yml

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -59,37 +59,21 @@ jobs:
5959
python-version: '3.14'
6060
- name: Lockfile maintenance
6161
if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
62-
run: |
63-
for dir in scripts/yarn client ; do
64-
if [ ! -d $dir ] ; then
65-
echo "Skipping $dir"
66-
continue
67-
fi
68-
pushd "$dir"
69-
yarn upgrade
70-
popd
71-
done
72-
73-
- run: ./scripts/yarn-update
74-
if: hashFiles('scripts/yarn-update') != ''
62+
working-directory: ./client
63+
run: yarn upgrade
7564

76-
- run: |
77-
if [ -d client ] ; then
78-
cd client
79-
yarn install --check-files
80-
yarn build
81-
cd ..
82-
fi
65+
- working-directory: ./client
66+
run: |
67+
yarn install --check-files
68+
yarn build
8369
8470
- name: Update SBOM
85-
if: hashFiles('docs/specs/sbom/partial/javascript.json') != ''
8671
working-directory: ./client
8772
run: |
8873
npm sbom --omit dev --sbom-format cyclonedx --sbom-type application > ../docs/specs/sbom/partial/javascript.json
8974
../scripts/reproducible-sbom.py ../docs/specs/sbom/partial/javascript.json
9075
9176
- name: Merge SBOM
92-
if: hashFiles('docs/specs/sbom/partial/python.json') != ''
9377
env:
9478
# renovate: datasource=github-releases depName=CycloneDX/cyclonedx-cli versioning=loose
9579
CYCLONEDX_CLI_VERSION: v0.29.2

0 commit comments

Comments
 (0)