mirror of
https://github.com/zeldaret/oot.git
synced 2024-11-10 19:20:13 +00:00
Check formatting in CI (#1652)
* Check formatting in CI
* Move deleteDir() to cleanup section
* Revert "Move deleteDir() to cleanup section"
This reverts commit 4b0dd80cac
.
* Give up on check_format.txt
* Fix formatting
This commit is contained in:
parent
8af0919e7d
commit
6e0d67f9ec
3 changed files with 31 additions and 2 deletions
6
Jenkinsfile
vendored
6
Jenkinsfile
vendored
|
@ -4,6 +4,12 @@ pipeline {
|
||||||
}
|
}
|
||||||
|
|
||||||
stages {
|
stages {
|
||||||
|
stage('Check formatting') {
|
||||||
|
steps {
|
||||||
|
echo 'Checking formatting...'
|
||||||
|
sh 'tools/check_format.sh'
|
||||||
|
}
|
||||||
|
}
|
||||||
stage('Setup') {
|
stage('Setup') {
|
||||||
steps {
|
steps {
|
||||||
sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
|
sh 'cp /usr/local/etc/roms/baserom_oot.z64 baseroms/gc-eu-mq-dbg/baserom.z64'
|
||||||
|
|
|
@ -54,7 +54,7 @@ void Main(void* arg) {
|
||||||
// "System heap initalization"
|
// "System heap initalization"
|
||||||
PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
|
PRINTF("システムヒープ初期化 %08x-%08x %08x\n", systemHeapStart, fb, gSystemHeapSize);
|
||||||
SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
|
SystemHeap_Init((void*)systemHeapStart, gSystemHeapSize); // initializes the system heap
|
||||||
|
|
||||||
#ifdef OOT_DEBUG
|
#ifdef OOT_DEBUG
|
||||||
{
|
{
|
||||||
void* debugHeapStart;
|
void* debugHeapStart;
|
||||||
|
@ -67,7 +67,7 @@ void Main(void* arg) {
|
||||||
debugHeapSize = 0x400;
|
debugHeapSize = 0x400;
|
||||||
debugHeapStart = SYSTEM_ARENA_MALLOC(debugHeapSize, "../main.c", 565);
|
debugHeapStart = SYSTEM_ARENA_MALLOC(debugHeapSize, "../main.c", 565);
|
||||||
}
|
}
|
||||||
|
|
||||||
PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
|
PRINTF("debug_InitArena(%08x, %08x)\n", debugHeapStart, debugHeapSize);
|
||||||
DebugArena_Init(debugHeapStart, debugHeapSize);
|
DebugArena_Init(debugHeapStart, debugHeapSize);
|
||||||
}
|
}
|
||||||
|
|
23
tools/check_format.sh
Executable file
23
tools/check_format.sh
Executable file
|
@ -0,0 +1,23 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
STATUSOLD=`git status --porcelain`
|
||||||
|
./format.py -j
|
||||||
|
if [ $? -ne 0 ]
|
||||||
|
then
|
||||||
|
echo "Formatter failed. Exiting."
|
||||||
|
exit -1
|
||||||
|
fi
|
||||||
|
STATUSNEW=`git status --porcelain`
|
||||||
|
|
||||||
|
if [ "${STATUSOLD}" != "${STATUSNEW}" ];
|
||||||
|
then
|
||||||
|
echo ""
|
||||||
|
echo "Misformatted files found. Run ./format.py and verify codegen is not impacted."
|
||||||
|
echo ""
|
||||||
|
diff --unified=0 --label "Old git status" <(echo "${STATUSOLD}") --label "New git status" <(echo "${STATUSNEW}")
|
||||||
|
echo ""
|
||||||
|
echo "Exiting."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
Loading…
Reference in a new issue