mirror of
https://github.com/DarkMatterCore/nxdumptool.git
synced 2024-11-22 18:26:39 +00:00
More workflow changes
This commit is contained in:
parent
1bfbed08b3
commit
f4e3843950
2 changed files with 16 additions and 24 deletions
38
.github/workflows/rewrite.yml
vendored
38
.github/workflows/rewrite.yml
vendored
|
@ -24,55 +24,47 @@ jobs:
|
||||||
sudo -n apt-get upgrade -y patch autoconf automake tar bzip2 diffutils pkgconf fakeroot p7zip-full git
|
sudo -n apt-get upgrade -y patch autoconf automake tar bzip2 diffutils pkgconf fakeroot p7zip-full git
|
||||||
sudo -n dkp-pacman -Syu --needed --noconfirm
|
sudo -n dkp-pacman -Syu --needed --noconfirm
|
||||||
|
|
||||||
- name: Checkout latest nxdumptool-rewrite commit
|
- name: Silence all git safe directory warnings
|
||||||
uses: actions/checkout@v3
|
run: git config --global --add safe.directory '*'
|
||||||
with:
|
|
||||||
submodules: recursive
|
|
||||||
|
|
||||||
# Workaround: manually use git instead of actions/checkout to overcome a 'missing token' error with act.
|
# Workaround: manually use git instead of actions/checkout to parse repository properties (e.g. branch name, commit hash, etc.) on our own.
|
||||||
#- name: Checkout latest libnx commit
|
- name: Checkout latest nxdumptool-rewrite commit
|
||||||
# run: |
|
run: |
|
||||||
# cd "$GITHUB_WORKSPACE/libs"
|
cd "$GITHUB_WORKSPACE"
|
||||||
# git clone --recurse-submodules https://github.com/switchbrew/libnx.git
|
git clone --branch rewrite --recurse-submodules https://github.com/DarkMatterCore/nxdumptool.git
|
||||||
|
|
||||||
- name: Checkout latest libnx commit
|
- name: Checkout latest libnx commit
|
||||||
uses: actions/checkout@v3
|
run: |
|
||||||
with:
|
cd "$GITHUB_WORKSPACE"
|
||||||
repository: switchbrew/libnx
|
git clone --recurse-submodules https://github.com/switchbrew/libnx.git
|
||||||
submodules: recursive
|
|
||||||
path: libs/libnx
|
|
||||||
|
|
||||||
- name: Set workspace permissions
|
- name: Set workspace permissions
|
||||||
run: chmod 777 -R "$GITHUB_WORKSPACE"
|
run: chmod 777 -R "$GITHUB_WORKSPACE"
|
||||||
|
|
||||||
- name: Build and install libnx
|
- name: Build and install libnx
|
||||||
run: |
|
run: |
|
||||||
cd "$GITHUB_WORKSPACE/libs/libnx"
|
cd "$GITHUB_WORKSPACE/libnx"
|
||||||
sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make install -j$(nproc)
|
sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make install -j$(nproc)
|
||||||
|
|
||||||
# Workaround for Docker image bug (see https://github.com/actions/checkout/issues/1169).
|
|
||||||
- name: "Workaround: add git safe directory (libusbhsfs)"
|
|
||||||
run: git config --system --add safe.directory "$GITHUB_WORKSPACE/libs/libusbhsfs"
|
|
||||||
|
|
||||||
- name: Build libusbhsfs dependencies
|
- name: Build libusbhsfs dependencies
|
||||||
run: |
|
run: |
|
||||||
cd "$GITHUB_WORKSPACE/libs/libusbhsfs"
|
cd "$GITHUB_WORKSPACE/nxdumptool/libs/libusbhsfs"
|
||||||
sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make fs-libs -j$(nproc)
|
sudo --preserve-env=DEVKITPRO,DEVKITARM,DEVKITPPC -n make fs-libs -j$(nproc)
|
||||||
|
|
||||||
- name: Build nxdumptool
|
- name: Build nxdumptool
|
||||||
run: |
|
run: |
|
||||||
cd "$GITHUB_WORKSPACE"
|
cd "$GITHUB_WORKSPACE/nxdumptool"
|
||||||
export COMMIT=$(git rev-parse --short HEAD)
|
export COMMIT=$(git rev-parse --short HEAD)
|
||||||
./build.sh
|
./build.sh
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: nxdumptool rewrite (NRO) - ${{ env.COMMIT }}.7z
|
name: nxdumptool-rewrite_poc_${{ env.COMMIT }}.7z
|
||||||
path: nxdumptool-rewrite_poc_${{ env.COMMIT }}.7z
|
path: nxdumptool-rewrite_poc_${{ env.COMMIT }}.7z
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
||||||
- uses: actions/upload-artifact@v3
|
- uses: actions/upload-artifact@v3
|
||||||
with:
|
with:
|
||||||
name: nxdumptool rewrite (Debug ELF) - ${{ env.COMMIT }}.7z
|
name: nxdumptool-rewrite_poc_${{ env.COMMIT }}-Debug_ELFs.7z
|
||||||
path: nxdumptool-rewrite_poc_${{ env.COMMIT }}-Debug_ELFs.7z
|
path: nxdumptool-rewrite_poc_${{ env.COMMIT }}-Debug_ELFs.7z
|
||||||
if-no-files-found: error
|
if-no-files-found: error
|
||||||
|
|
|
@ -623,7 +623,7 @@ static bool usbStartSession(void)
|
||||||
cmd_block->app_ver_minor = VERSION_MINOR;
|
cmd_block->app_ver_minor = VERSION_MINOR;
|
||||||
cmd_block->app_ver_micro = VERSION_MICRO;
|
cmd_block->app_ver_micro = VERSION_MICRO;
|
||||||
cmd_block->abi_version = USB_ABI_VERSION;
|
cmd_block->abi_version = USB_ABI_VERSION;
|
||||||
snprintf(cmd_block->git_commit, sizeof(cmd_block->git_commit), GIT_COMMIT);
|
snprintf(cmd_block->git_commit, sizeof(cmd_block->git_commit), "%s", GIT_COMMIT);
|
||||||
|
|
||||||
ret = usbSendCommand();
|
ret = usbSendCommand();
|
||||||
if (ret)
|
if (ret)
|
||||||
|
|
Loading…
Reference in a new issue