Skip to content

Commit 4e53bba

Browse files
authored
Fix setuptools regression (#134)
* Fix setuptools regression See pypa/setuptools#4374 Fixes #133 Updating actions and pyinstaller
1 parent 558e7d2 commit 4e53bba

File tree

7 files changed

+21
-11
lines changed

7 files changed

+21
-11
lines changed

.github/workflows/check-licenses.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,19 @@ jobs:
4545
generate-dash: true
4646

4747
- name: Setup Java JDK
48-
- uses: actions/setup-java@v4
48+
uses: actions/setup-java@v4
4949
with:
5050
distribution: 'temurin'
5151
java-version: '11.0.19'
5252

5353
- name: Run dash
5454
shell: bash
55-
continue-on-error: true
5655
run: |
5756
wget -O dash.jar "https://repo.eclipse.org/content/repositories/dash-licenses/org/eclipse/dash/org.eclipse.dash.licenses/1.0.2/org.eclipse.dash.licenses-1.0.2.jar"
58-
java -jar dash.jar clearlydefined.input -summary DEPENDENCIES
57+
java -jar dash.jar clearlydefined.input -summary DEPENDENCIES > dash.out 2>&1 || true
58+
echo -e "Dash output: \n\`\`\` " >> $GITHUB_STEP_SUMMARY
59+
cat dash.out >> $GITHUB_STEP_SUMMARY
60+
echo -e "\n\`\`\`"
5961
6062
- name: Upload dash input/output as artifacts
6163
uses: actions/upload-artifact@v4

.github/workflows/ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
python3 -m pip install tox-gh-actions
5858
5959
- name: Run Linters
60-
uses: pre-commit/[email protected].0
60+
uses: pre-commit/[email protected].1
6161

6262
- name: Run the databroker binary
6363
run: |

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656

5757
# Initializes the CodeQL tools for scanning.
5858
- name: Initialize CodeQL
59-
uses: github/codeql-action/init@v2
59+
uses: github/codeql-action/init@v3
6060
with:
6161
languages: ${{ matrix.language }}
6262
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -67,7 +67,7 @@ jobs:
6767
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
6868
# If this step fails, then you should remove it and run the build manually (see below)
6969
- name: Autobuild
70-
uses: github/codeql-action/autobuild@v2
70+
uses: github/codeql-action/autobuild@v3
7171

7272
# ℹ️ Command-line programs to run using the OS shell.
7373
# 📚 https://git.io/JvXDl
@@ -81,4 +81,4 @@ jobs:
8181
# make release
8282

8383
- name: Perform CodeQL Analysis
84-
uses: github/codeql-action/analyze@v2
84+
uses: github/codeql-action/analyze@v3

.github/workflows/project-creation.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ on:
2727
pull_request:
2828
branches:
2929
- main
30+
# Scheduled build to fetch regressions, if any
31+
schedule:
32+
- cron: "0 4 * * *"
3033

3134
jobs:
3235
check-project-creation:
@@ -89,6 +92,11 @@ jobs:
8992
CREATE_ARGS="-e ${{ matrix.example }}"
9093
fi
9194
velocitas create -c vapp-core-python $CREATE_ARGS
95+
# Velocitas CLI fetches an older merged/released version of the example
96+
# But we want to check the one in this repository so lets copy it
97+
if [ "${{ matrix.example }}" != "no-example" ]; then
98+
cp -r ../sdk/examples/${{ matrix.example }}/* ../app/app
99+
fi
92100
93101
- name: Install dependencies
94102
shell: bash

.project-creation/.skeleton/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN /bin/bash -c 'set -ex && \
3232
pip3 install --no-cache-dir scons; \
3333
fi'
3434

35-
RUN pip3 install --no-cache-dir pyinstaller==5.9.0 \
35+
RUN pip3 install --no-cache-dir pyinstaller==6.9 \
3636
&& pip3 install --no-cache-dir patchelf==0.17.0.0 \
3737
&& pip3 install --no-cache-dir staticx \
3838
&& pip3 install --no-cache-dir -r ./workspace/app/requirements.txt \

NOTICE-3RD-PARTY-CONTENT.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
|actions/upload-artifact|v4|MIT License|
7878
|danielpalme/ReportGenerator-GitHub-Action|5.2.0|Apache License 2.0|
7979
|devcontainers/ci|v0.3|MIT License|
80-
|github/codeql-action|v2|MIT License|
80+
|github/codeql-action|v3|MIT License|
8181
|mikepenz/action-junit-report|v4|Apache License 2.0|
82-
|pre-commit/action|v3.0.0|MIT License|
82+
|pre-commit/action|v3.0.1|MIT License|
8383
|softprops/action-gh-release|v1|MIT License|

examples/seat-adjuster/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN /bin/bash -c 'set -ex && \
3232
pip3 install --no-cache-dir scons; \
3333
fi'
3434

35-
RUN pip3 install --no-cache-dir pyinstaller==5.9.0 \
35+
RUN pip3 install --no-cache-dir pyinstaller==6.9 \
3636
&& pip3 install --no-cache-dir patchelf==0.17.0.0 \
3737
&& pip3 install --no-cache-dir staticx \
3838
&& pip3 install --no-cache-dir -r ./workspace/app/requirements.txt \

0 commit comments

Comments
 (0)