Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pulling develop into master for v0.1.0-beta.0 #9

Open
wants to merge 53 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
0b69e47
Merge pull request #1 from LaroldsJubilantJunkyard/master
LaroldsJubilantJunkyard May 5, 2023
d1ebfd4
adding ts-node to package.json
LaroldsJubilantJunkyard May 5, 2023
59a6344
adding basic tests
LaroldsJubilantJunkyard May 5, 2023
cda1166
adding directory creation before build and package
LaroldsJubilantJunkyard May 5, 2023
84d0076
adding pkg global install command to github default action
LaroldsJubilantJunkyard May 5, 2023
2228722
adding unit tests
LaroldsJubilantJunkyard May 13, 2023
753ced3
removing getting gbdk for now
LaroldsJubilantJunkyard May 13, 2023
b269c1c
changing __dirname to current working directory.
LaroldsJubilantJunkyard May 13, 2023
7de6b8a
updating file utils test with linux and windows separate tests
LaroldsJubilantJunkyard May 13, 2023
aa3f6ff
moving tests to src folder
LaroldsJubilantJunkyard May 13, 2023
8983db4
updating github workflow to exclude execution tests
LaroldsJubilantJunkyard May 13, 2023
b117741
removing extra file
LaroldsJubilantJunkyard May 13, 2023
7b9e916
removing old assets folder
LaroldsJubilantJunkyard May 13, 2023
f90b653
adding ldtk multiple levels
LaroldsJubilantJunkyard May 14, 2023
d17246c
adding build and node_modules folder to ignore patterns
LaroldsJubilantJunkyard May 14, 2023
24b03d4
readprocessarguments becoming async
LaroldsJubilantJunkyard May 15, 2023
426e6e2
fixing integration test
LaroldsJubilantJunkyard May 15, 2023
8100411
trying gbdk executio ntest
LaroldsJubilantJunkyard May 17, 2023
25e2715
fixing changed folder in execution test workflow command
LaroldsJubilantJunkyard May 17, 2023
f26b872
fixing gbdk execution test name change
LaroldsJubilantJunkyard May 17, 2023
e622f7b
adding linux tests and targets
LaroldsJubilantJunkyard May 17, 2023
0c5ffef
skipping ldtk execution test
LaroldsJubilantJunkyard May 17, 2023
c43e026
generalizing makefile for execution tests
LaroldsJubilantJunkyard May 18, 2023
a1c2363
fixing exectuable file test
LaroldsJubilantJunkyard May 18, 2023
15347fb
making object embeddeding optional.
LaroldsJubilantJunkyard May 29, 2023
0dd5c86
adjusting the makefile for gbdk execution test
LaroldsJubilantJunkyard May 29, 2023
a733c31
adjusting execution test mkdir for gbdk
LaroldsJubilantJunkyard May 29, 2023
e07daab
adding gbdk/rgbds home arguments.
LaroldsJubilantJunkyard Jun 13, 2023
c8837ab
Adding initial rgbds execution test.
LaroldsJubilantJunkyard Jun 13, 2023
cede9d6
makefile adjustments with variables
LaroldsJubilantJunkyard Jun 13, 2023
1640bce
adding recommendation for mkdirs from bbbbbr
LaroldsJubilantJunkyard Jun 14, 2023
ffd1302
removing conditionals for makefiles
LaroldsJubilantJunkyard Jun 14, 2023
0a30fd6
moving gbdk export for unit tests
LaroldsJubilantJunkyard Jun 14, 2023
a3a97f5
passing gbdk home for execution tests
LaroldsJubilantJunkyard Jun 14, 2023
cdd2f12
adding rgbds checkout
LaroldsJubilantJunkyard Jun 14, 2023
5b579ae
adding rgbds install and remove
LaroldsJubilantJunkyard Jun 14, 2023
7ea73dc
switching rgbds clone and install
LaroldsJubilantJunkyard Jun 14, 2023
eaf5618
trying export of rgbds
LaroldsJubilantJunkyard Jun 14, 2023
da7a3c4
adding ls and echo for debugging
LaroldsJubilantJunkyard Jun 14, 2023
5faad4c
adding make install to rgbds
LaroldsJubilantJunkyard Jun 14, 2023
8b78f1b
adding echo and ls
LaroldsJubilantJunkyard Jun 14, 2023
2f48e5d
jumping into inner folder
LaroldsJubilantJunkyard Jun 14, 2023
4394ffc
retrying install rgbds from poked dis
LaroldsJubilantJunkyard Jun 14, 2023
6c45184
adding user local install
LaroldsJubilantJunkyard Jun 14, 2023
a3fbd0a
adding path echo
LaroldsJubilantJunkyard Jun 14, 2023
db2c1f6
adding echo and ls
LaroldsJubilantJunkyard Jun 14, 2023
803b6f9
adding linux rgbds location variable
LaroldsJubilantJunkyard Jun 14, 2023
ebb6bf2
removing accidental override of env variable
LaroldsJubilantJunkyard Jun 15, 2023
7d36fd6
adding missing env var for rgbgfx
LaroldsJubilantJunkyard Jun 15, 2023
7033da0
fixing case change for gameboy tilemap tool output in execution test
LaroldsJubilantJunkyard Jun 15, 2023
94511f5
adjusting case for rgbds object output
LaroldsJubilantJunkyard Jun 15, 2023
a6f5d2f
testing upload artifacts
LaroldsJubilantJunkyard Jun 16, 2023
ef207c8
testing deleting node modules before upload
LaroldsJubilantJunkyard Jun 16, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 86 additions & 0 deletions .github/workflows/default-master.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: Default Github Action

on:
pull_request:
branches: [ "master" ]


jobs:
build:
runs-on: ${{matrix.os}}

strategy:
matrix:
node-version: [14.x, 16.x, 18.x]
include:
- os: ubuntu-20.04
name: Linux-x64

steps:
- uses: actions/checkout@v3

- name: Checkout rgbds
uses: actions/checkout@master
with:
path: rgbds
ref: v0.6.1
repository: gbdev/rgbds

- name: Install rgbds
working-directory: rgbds
run: |
sudo make install

- name: Remove rgbds
run: |
rm -rf rgbds

# ==== OS Specific Dependencies ====
- name: Linux Depends
if: matrix.name == 'Linux-x64'
run: |
# Pull in GBDK-2020 4.1.0
curl -Lo gbdk-linux64.tar.gz https://github.com/gbdk-2020/gbdk-2020/releases/download/4.1.1/gbdk-linux64.tar.gz
tar xvfz gbdk-linux64.tar.gz
export GBDK_HOME=`pwd`/gbdk/

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build
run: |

# make sure pkg is installed
# pkg can be found here: https://www.npmjs.com/pkg
npm install -g pkg
npm install

# skip the unit tests, and perform execution tests
export GBDK_HOME=`pwd`/gbdk/

# skip the execution tests, and perform unit tests
npm test -- --testPathIgnorePatterns /src/tests/execution/ --testPathIgnorePatterns /build/ --testPathIgnorePatterns /node_modules/

# Make sure we have 'dist' folders for our versions
mkdir dist
mkdir dist/windows
mkdir dist/linux
mkdir dist/macos

# Build the code and and package the application
npm run build:package

npm test -- src/tests/execution/gbdk/gbdk.execution.test.ts
npm test -- src/tests/execution/rgbds/rgbds.execution.test.ts

# delete the node modules folder before we upload the artifacts
rm -rf node_modules

- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: assets-for-download
path: dist

89 changes: 72 additions & 17 deletions .github/workflows/default.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,82 @@ name: Default Github Action
on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "master" ]

jobs:
build:
runs-on: ubuntu-latest
runs-on: ${{matrix.os}}

strategy:
matrix:
matrix:
node-version: [14.x, 16.x, 18.x]
include:
- os: ubuntu-20.04
name: Linux-x64

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build
run: |
npm install
npm test
npm run build:package
- uses: actions/checkout@v3

- name: Checkout rgbds
uses: actions/checkout@master
with:
path: rgbds
ref: v0.6.1
repository: gbdev/rgbds

- name: Install rgbds
working-directory: rgbds
run: |
sudo make install

- name: Remove rgbds
run: |
rm -rf rgbds

# ==== OS Specific Dependencies ====
- name: Linux Depends
if: matrix.name == 'Linux-x64'
run: |
# Pull in GBDK-2020 4.1.0
curl -Lo gbdk-linux64.tar.gz https://github.com/gbdk-2020/gbdk-2020/releases/download/4.1.1/gbdk-linux64.tar.gz
tar xvfz gbdk-linux64.tar.gz
export GBDK_HOME=`pwd`/gbdk/

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Build
run: |

# make sure pkg is installed
# pkg can be found here: https://www.npmjs.com/pkg
npm install -g pkg
npm install

# skip the unit tests, and perform execution tests
export GBDK_HOME=`pwd`/gbdk/

# skip the execution tests, and perform unit tests
npm test -- --testPathIgnorePatterns /src/tests/execution/ --testPathIgnorePatterns /build/ --testPathIgnorePatterns /node_modules/

# Make sure we have 'dist' folders for our versions
mkdir dist
mkdir dist/windows
mkdir dist/linux
mkdir dist/macos

# Build the code and and package the application
npm run build:package

npm test -- src/tests/execution/gbdk/gbdk.execution.test.ts
npm test -- src/tests/execution/rgbds/rgbds.execution.test.ts

# delete the node modules folder before we upload the artifacts
rm -rf node_modules


- name: Upload Artifacts
uses: actions/upload-artifact@v2
with:
name: assets-for-download
path: dist
11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
node_modules/
dist/
build/
build/

# ignore generated folders for the integration tests
src/tests/integration/gen/

# ignore generated folders for the execution tests
src/tests/execution/gbdk/gen/
src/tests/execution/gbdk/obj/
src/tests/execution/rgbds/gen/
src/tests/execution/rgbds/obj/
7 changes: 7 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"files.associations": {
"world1tileset.h": "c",
"world1area1.h": "c",
"enemies.h": "c"
}
}
Binary file removed assets/Enemies.png
Binary file not shown.
115 changes: 0 additions & 115 deletions assets/World1Area2.tmx

This file was deleted.

Loading
Loading