Skip to content

Commit

Permalink
minor workflow tweaks
Browse files Browse the repository at this point in the history
Change-Id: I13aadfd42df83e8d9687888b2c418c8c98cd3001
  • Loading branch information
cooljeanius committed Nov 18, 2024
1 parent 8f90b14 commit 43d8672
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/apple-gdb-1824-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ jobs:
export PPC_CONFIG_PATH=/opt/sw/etc/; \
fi
sync && printf '\n' && sync && date && sync
- run: cd .profile.d && test -e ./.profile_generic && test -r ./.profile_generic && test -s ./.profile_generic && sync && source ./.profile_generic && sync && (env | uniq | sort | uniq | grep -v "\*\*\*" | grep -v "PWD\=") && sync && sleep 1
- run: cd .profile.d && test -e ./.profile_generic && test -r ./.profile_generic && test -s ./.profile_generic && sync && source ./.profile_generic && sync && (env | uniq | sort | uniq | grep -v "\*\*\*" | grep -v "PWD\=") && sync && (if test -x "$(which xcode-select)"; then stat "$(which xcode-select)" && xcode-select --print-path && xcode-select --version; else echo "no usable xcode-select found"; fi)
- run: ./configure --enable-silent-rules --disable-dependency-tracking CC="sccache ${{ matrix.compiler }}" OBJC="sccache ${{ matrix.compiler }}"
- run: make -ki -C libcheckpoint || make -ki -C libcheckpoint -f Makefile_orig || make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || (if test -x "$(which ant)"; then (ant || echo "FIXME, ant build is broken!"); else echo "ant missing"; fi)
- run: if test ! -e libcheckpoint/libcheckpoint.dylib; then (sync && echo "ensuring libcheckpoint is built" && sync && make -ki -C libcheckpoint -f Makefile_orig RC_CFLAGS="-std=gnu89 -w -Wno-error" && sync) || (sync && make -ki -C macsbug && sync) || (sync && make -ki -C macsbug/gdb_plugin_support && sync) || (if test -x "$(which ant)"; then ant; else echo "ant missing"; fi); else (sync && stat libcheckpoint/libcheckpoint.dylib && sync); fi
Expand Down Expand Up @@ -427,7 +427,7 @@ jobs:
sync && echo "...done cleaning up."
time (sync && pwd && sync && ls && sync && du && sync && df && sync)
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.4.3
uses: actions/upload-artifact@v4
if: "${{ always() }}"
with:
# Artifact name
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apple-gdb-1824.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ jobs:
- run: (time (pwd && sync && ls && sync && stat . && sync)) && sleep 1 && echo "done"
if: "${{ success() }}"
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.4.3
uses: actions/upload-artifact@v4
if: "${{ success() }}"
with:
# Artifact name
Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,10 @@ jobs:
elif test ${{ matrix.language }} == 'javascript-typescript'; then \
sudo apt-get -y install node-optionator eslint uglifyjs \
libjs-modernizr node-babel-eslint npm wkhtmltopdf node-dompurify \
libjavascriptcoregtk-4.0-bin webkit2gtk-driver; \
libjavascriptcoregtk-4.0-bin webkit2gtk-driver yamllint; \
elif test ${{ matrix.language }} == 'go'; then \
sudo apt-get -y install gccgo gccgo-multilib golang golang-go \
golang-src golang-ar-dev golang-honnef-go-tools-dev; \
golang-src golang-ar-dev golang-honnef-go-tools-dev yamllint; \
elif test ${{ matrix.language }} == 'csharp'; then \
sudo apt-get -y install mono-csharp-shell dotnet-host mono-mcs nant \
nunit mono-xbuild yamllint monodoc-nunit-manual; \
Expand Down Expand Up @@ -254,6 +254,8 @@ jobs:
stat info.min.js && du info.min.js; \
elif test -x "$(which yamllint)"; then \
pwd && (yamllint . || yamllint --version); \
else \
stat "$(which npx)" && npx --version; \
fi; \
sync && echo "Done with texinfo javascript."; \
popd || exit; \
Expand Down Expand Up @@ -371,7 +373,7 @@ jobs:
make -ki -C libcheckpoint || \
make -ki -C libcheckpoint -f Makefile_orig || \
make -ki -C macsbug || make -ki -C macsbug/gdb_plugin_support || \
(if test -x "$(which ant)"; then ant; fi)
(if test -x "$(which ant)"; then ant; else echo "no usable ant"; fi)
cd src
if test -x "$(which sccache)"; then \
./configure --disable-werror --enable-silent-rules \
Expand Down Expand Up @@ -815,7 +817,7 @@ jobs:
fi
- name: Upload a Build Artifact
uses: actions/upload-artifact@v4.4.3
uses: actions/upload-artifact@v4
if: matrix.language == 'c-cpp' && success()
with:
# Artifact name:
Expand Down

0 comments on commit 43d8672

Please sign in to comment.