Skip to content

Commit

Permalink
Deprecate CPack packages and old changelog, fix ldscripts
Browse files Browse the repository at this point in the history
  • Loading branch information
spicyjpeg committed Oct 14, 2024
1 parent 9c792e6 commit 787db19
Show file tree
Hide file tree
Showing 20 changed files with 17 additions and 1,117 deletions.
192 changes: 0 additions & 192 deletions .github/scripts/generate_release_notes.py

This file was deleted.

26 changes: 7 additions & 19 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
name: Build PSn00bSDK
on: [ push, pull_request ]
env:
BINUTILS_VERSION: '2.41'
BINUTILS_VERSION: '2.43'
BINUTILS_OPTIONS: '--disable-docs --disable-nls --disable-werror --with-float=soft'
GCC_VERSION: '13.2.0'
GCC_VERSION: '14.2.0'
GCC_OPTIONS: '--disable-docs --disable-nls --disable-werror --disable-libada --disable-libssp --disable-libquadmath --disable-threads --disable-libgomp --disable-libstdcxx-pch --disable-hosted-libstdcxx --enable-languages=c,c++ --without-isl --without-headers --with-float=soft --with-gnu-as --with-gnu-ld'
GCC_TARGET: 'mipsel-none-elf'

Expand All @@ -25,7 +25,7 @@ jobs:
steps:
- name: Initialize toolchain cache
id: _cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4
with:
enableCrossOsArchive: true
key: gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
Expand Down Expand Up @@ -98,7 +98,7 @@ jobs:
echo "C:\msys64\usr\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
- name: Initialize toolchain cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4
with:
enableCrossOsArchive: true
key: gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
Expand Down Expand Up @@ -136,7 +136,7 @@ jobs:

steps:
- name: Initialize toolchain cache
uses: actions/cache@v3.3.2
uses: actions/cache@v4
with:
enableCrossOsArchive: true
key: gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
Expand Down Expand Up @@ -175,7 +175,7 @@ jobs:
steps:
- name: Initialize toolchain cache
if: ${{ github.ref_type == 'tag' }}
uses: actions/cache@v3.3.2
uses: actions/cache@v4
with:
enableCrossOsArchive: true
key: gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}
Expand All @@ -189,20 +189,9 @@ jobs:
cd ../linux
zip -9 -q -r ../../gcc-${{ env.GCC_TARGET }}-${{ env.GCC_VERSION }}-linux.zip .
- name: Fetch repo contents
if: ${{ github.ref_type == 'tag' }}
uses: actions/checkout@v4
with:
path: sdk

- name: Generate release notes
if: ${{ github.ref_type == 'tag' }}
run: |
python3 sdk/.github/scripts/generate_release_notes.py -v ${{ github.ref_name }} -o release.md sdk/CHANGELOG.md
- name: Fetch build artifacts
if: ${{ github.ref_type == 'tag' }}
uses: actions/download-artifact@v4
uses: actions/download-artifact@v4.1.7
with:
path: .

Expand All @@ -211,7 +200,6 @@ jobs:
uses: softprops/action-gh-release@v1
with:
#fail_on_unmatched_files: true
body_path: release.md
files: |
*.zip
psn00bsdk-windows/*
Expand Down
4 changes: 0 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,3 @@ install(
DESTINATION ${CMAKE_INSTALL_DATADIR}/psn00bsdk
COMPONENT examples
)

## CPack configuration

include(cpack/setup.cmake)
6 changes: 1 addition & 5 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
"inherits": "default",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"SKIP_EXAMPLES": "ON",
"BUNDLE_TOOLCHAIN": "ON",
"BUNDLE_NINJA": "ON"
"SKIP_EXAMPLES": "ON"
}
},
{
Expand All @@ -36,8 +34,6 @@
"binaryDir": "${sourceDir}/../build",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"BUNDLE_TOOLCHAIN": "ON",
"BUNDLE_NINJA": "ON",
"LIBPSN00B_GENERATOR": "Ninja",
"PSN00BSDK_TARGET": "$env{GCC_TARGET}",
"PSN00BSDK_GIT_TAG": "$env{GITHUB_REF_NAME}",
Expand Down
45 changes: 0 additions & 45 deletions cpack/convert_images.sh

This file was deleted.

27 changes: 0 additions & 27 deletions cpack/description.txt

This file was deleted.

Loading

0 comments on commit 787db19

Please sign in to comment.