diff options
| -rw-r--r-- | .github/workflows/release.yml | 20 | ||||
| -rw-r--r-- | Examples/nrom_split_lossy/Makefile | 7 |
2 files changed, 13 insertions, 14 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 533d292..7b0f5ce 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,13 +28,6 @@ jobs: publish:
needs: create-release
runs-on: ubuntu-latest
- env:
- APP_NAME: nestiler
- PROJECT_PATH: NesTiler
- OUTPUT_DIR: output
- CONFIGURATION: Release
- OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
- OUTPUT_FILE: nestiler-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.sc == 'self-contained' && '-self-contained' || '' }}.${{ matrix.os == 'win' && 'zip' || 'tar.gz' }}
strategy:
matrix:
os: [win, linux, osx]
@@ -47,6 +40,13 @@ jobs: arch: x86
- os: osx
arch: arm
+ env:
+ APP_NAME: nestiler
+ PROJECT_PATH: NesTiler
+ OUTPUT_DIR: output
+ CONFIGURATION: Release
+ OUTPUT_SUBDIR: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.sc }}
+ OUTPUT_FILE: ${{ APP_NAME }}-${{ matrix.os }}-${{ matrix.arch }}${{ matrix.sc == 'self-contained' && '-self-contained' || '' }}.${{ matrix.os == 'win' && 'zip' || 'tar.gz' }}
steps:
- name: Fix line endings
run: git config --global core.autocrlf false
@@ -55,10 +55,10 @@ jobs: - name: Setup .NET
uses: actions/setup-dotnet@v2
with:
- dotnet-version: 5.0.x
+ dotnet-version: 6.0.x
- name: Build
env:
- SC_OPS: ${{ matrix.sc == 'self-contained' && '--self-contained true -p:PublishTrimmed=True' || '--no-self-contained' }}
+ SC_OPS: ${{ matrix.sc == 'self-contained' && '--self-contained true -p:PublishTrimmed=False' || '--no-self-contained' }}
run: dotnet publish ${{ env.PROJECT_PATH }} -c ${{ env.CONFIGURATION }} -r ${{ matrix.os }}-${{ matrix.arch }} -p:PublishSingleFile=true ${{ env.SC_OPS }} -o ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}/${{ env.APP_NAME }} -p:IncludeAllContentForSelfExtract=true
- name: Archive
working-directory: ${{ env.OUTPUT_DIR }}/${{ env.OUTPUT_SUBDIR }}
@@ -76,7 +76,7 @@ jobs: TAG_REF_NAME: ${{ github.ref }}
REPOSITORY_NAME: ${{ github.repository }}
run: |
- echo ::set-output name=file_name::${REPOSITORY_NAME##*/}-${TAG_REF_NAME##*/v} # RepositoryName-v1.0.0
+ echo ::set-output name=file_name::${REPOSITORY_NAME##*/}-${TAG_REF_NAME##*/v}
value=`cat release_url/release_url.txt`
echo ::set-output name=upload_url::$value
- name: Upload
diff --git a/Examples/nrom_split_lossy/Makefile b/Examples/nrom_split_lossy/Makefile index 3ead29a..7f929c0 100644 --- a/Examples/nrom_split_lossy/Makefile +++ b/Examples/nrom_split_lossy/Makefile @@ -4,7 +4,6 @@ TILER?=nestiler SOURCE=main.asm EXECUTABLE=nrom_split_lossy.nes HEIGHT1=128 -HEIGHT2=112 IMAGE?=../../TestImages/Images/me.png @@ -26,7 +25,7 @@ build: $(EXECUTABLE) all: $(EXECUTABLE) clean: - rm -f *.nes *.lst *.nl *.bin + rm -f *.nes *.lst *.nl *.bin preview*.png run: $(EXECUTABLE) $(EMU) $(EXECUTABLE) @@ -45,10 +44,10 @@ $(PALETTE_0_BIN) $(PALETTE_1_BIN) \ $(PALETTE_2_BIN) $(PALETTE_3_BIN) \ $(PREVIEW_1) $(PREVIEW_2): $(IMAGE) $(TILER) --mode bg --enable-palettes 0,1,2,3 \ - --in-0 $(IMAGE):0:$(HEIGHT1) --in-1 $(IMAGE):$(HEIGHT1):$(HEIGHT2) \ + --in-0 $(IMAGE):0:$(HEIGHT1) --in-1 $(IMAGE):$(HEIGHT1) \ --out-pattern-table-0 $(PATTERN_0_BIN) --out-pattern-table-1 $(PATTERN_1_BIN) \ --out-name-table-0 $(NAME_TABLE_0_BIN) --out-name-table-1 $(NAME_TABLE_1_BIN) \ --out-attribute-table-0 $(ATTR_TABLE_0_BIN) --out-attribute-table-1 $(ATTR_TABLE_1_BIN) \ --out-palette-0 $(PALETTE_0_BIN) --out-palette-1 $(PALETTE_1_BIN) \ --out-palette-2 $(PALETTE_2_BIN) --out-palette-3 $(PALETTE_3_BIN) \ - --lossy --out-preview-0 $(PREVIEW_1) --out-preview-1 $(PREVIEW_2) + --lossy 3 --out-preview-0 $(PREVIEW_1) --out-preview-1 $(PREVIEW_2) |