Skip to content

Commit

Permalink
Fix build warnings, update workflow file (#41)
Browse files Browse the repository at this point in the history
  • Loading branch information
R-YaTian authored Aug 26, 2024
1 parent 9be6da4 commit ce4c29c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 8 deletions.
12 changes: 8 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,17 @@ jobs:
name: Build with Docker using devkitARM
steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: recursive
- name: Install tools
run: |
sudo apt-get update
sudo apt-get install p7zip-full python -y
- name: Silence all git safe directory warnings
run: |
git config --system --add safe.directory '*'
git fetch --prune --unshallow --tags
- name: Build
id: build
run: |
Expand All @@ -45,20 +49,20 @@ jobs:
7z a template.7z "for SDNAND SD card"
mv template.7z hiyaCFW.7z
- name: Publish build to GH Actions
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@main
with:
path: hiyaCFW.7z
name: build

# Only run this for non-PR jobs.
publish_build:
runs-on: ubuntu-latest
name: Publish build to TWLBot/Builds
name: Publish build to release
if: ${{ success() && !startsWith(github.ref, 'refs/pull') }}
needs: build
steps:
- name: Download artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@main
with:
name: build
path: build
Expand Down
2 changes: 1 addition & 1 deletion arm9/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ include $(DEVKITARM)/ds_rules
ifneq ($(shell echo $(shell git tag -l --points-at HEAD) | head -c 1),)
GIT_VER := $(shell git tag -l --points-at HEAD)
else
GIT_VER := $(shell git describe --abbrev=0 --tags)-$(shell git rev-parse --short HEAD)
GIT_VER := $(shell git describe --tags --match v[0-9]* --abbrev=7 | sed 's/-[0-9]*-g/-/')
endif

# Ensure version.h exists
Expand Down
6 changes: 3 additions & 3 deletions bootloader/source/fat.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ typedef struct
u8 fileSysType[8];
// Bootcode
u8 bootCode[448];
} fat16;
} __PACKED fat16;
struct
{
// FAT32 extended block
Expand All @@ -126,7 +126,7 @@ typedef struct
u8 fileSysType[8];
// Bootcode
u8 bootCode[420];
} fat32;
} __PACKED fat32;
} extBlock;

__PACKED u16 bootSig;
Expand Down Expand Up @@ -345,7 +345,7 @@ bool FAT_InitFiles (bool initCard)
// Read in boot sector
bootSec = (BOOT_SEC*) globalBuffer;
CARD_ReadSector (bootSector, bootSec);

// Store required information about the file system
if (bootSec->sectorsPerFAT != 0)
{
Expand Down

0 comments on commit ce4c29c

Please sign in to comment.