Skip to content

Commit

Permalink
Updated project and workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
mathewmariani committed Mar 23, 2024
1 parent 30dcb18 commit c82c426
Show file tree
Hide file tree
Showing 17 changed files with 1,685 additions and 3,640 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Build and Deploy

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

permissions:
contents: write

jobs:
build-and-deploy:

runs-on: ubuntu-latest

steps:

- name: Checkout 🛎️
uses: actions/checkout@v3

- name: Install Packages 📦
run: |
npm ci
- name: Building Website 🔧
run: |
npm run build
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@v4
with:
folder: website
120 changes: 7 additions & 113 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,117 +1,11 @@
# build directory
.build
# build output
website/

# Compiled Object files
*.slo
*.lo
*.o
*.obj

# Precompiled Headers
*.gch
*.pch

# Compiled Dynamic libraries
*.so
*.dylib
*.dll

# Fortran module files
*.mod

# Compiled Static libraries
*.lai
*.la
*.a
*.lib

# Executables
*.exe
*.out
*.app

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# OSX specific
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

# CMake
build

# Logs
logs
*.log
npm-debug.log*

# Runtime data
pids
*.pid
*.seed

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release
# intermediate files
.cache/*

# Dependency directories
node_modules
jspm_packages

# Optional npm cache directory
.npm
node_modules/

# Optional REPL history
.node_repl_history
# macOS
.DS_Store
34 changes: 0 additions & 34 deletions .travis.yml

This file was deleted.

2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2019 Mathew Mariani
Copyright (c) 2024 Mathew Mariani

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
# MARIE Simulator [![Build Status](https://travis-ci.org/mathewmariani/marie-simulator.svg?branch=master)](https://travis-ci.org/mathewmariani/marie-simulator)
# MARIE Simulator
An assembly language simulator written in Javascript with VueJS

Follow development on the [Trello Board](https://trello.com/b/JW47LSjx/marie-simulator)

## Cheatsheet

#### Registers
**AC**, a 16-bit accumulator<br>
**IR**, a 16-bit register which holds an instruction immediately preceding its execution.<br>
Expand Down Expand Up @@ -124,4 +121,4 @@ M[MAR] ← MBR
## Acknowledgements
Thank you to Marco Schweighauser and his very helpful blog [post](https://www.mschweighauser.com/make-your-own-assembler-simulator-in-javascript-part1/)

Essentials of Computer Organization and Architecture, Second Edition by Linda Null and Julia Lobur for the creation of the [Marie Simulator]( http://computerscience.jbpub.com/ecoa/2e/student_resources.cfm)
Essentials of Computer Organization and Architecture, Second Edition by Linda Null and Julia Lobur for the creation of the [Marie Simulator](http://computerscience.jbpub.com/ecoa/2e/student_resources.cfm)
7 changes: 0 additions & 7 deletions build.sh

This file was deleted.

29 changes: 0 additions & 29 deletions deploy.sh

This file was deleted.

27 changes: 0 additions & 27 deletions gulpfile.js

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c82c426

Please sign in to comment.