Skip to content

Commit

Permalink
Merge pull request #478 from engaging-computing/dev
Browse files Browse the repository at this point in the history
2.3.0 Release
  • Loading branch information
kdvalin authored Apr 16, 2021
2 parents e646918 + e8c38b2 commit 684ffa2
Show file tree
Hide file tree
Showing 27 changed files with 741 additions and 664 deletions.
40 changes: 0 additions & 40 deletions .circleci/config.yml

This file was deleted.

1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
25 changes: 25 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Build MYR

on: [push, pull_request]

jobs:
ci-checks:
runs-on: ubuntu-latest
container:
image: node:10.13

steps:
- uses: actions/checkout@v1
- name: Setup cache
uses: actions/cache@v2
with:
path: node_modules
key: ${{ runner.os }}-${{ hashFiles('**/package-lock.json') }}
- name: Fetch packages
run: npm ci
- name: Run Linter
run: npm run lint
- name: Run unit tests
run: npm test
- name: Build production build
run: npm run build
28 changes: 28 additions & 0 deletions .github/workflows/deploy_beta.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Deploy staging image

on:
push:
branches:
- dev

jobs:
update_upstream:
runs-on: ubuntu-latest
container:
image: docker
steps:
- uses: actions/checkout@v1
- name: Set the branch variable
uses: nelonoel/branch-name@v1.0.1
- name: Log into Quay
run: docker login quay.io -u umlecg+myr_bot -p ${{ secrets.QUAY_BOT_PASSWORD }}
- name: Build the docker image
run: docker build -t quay.io/umlecg/myr-frontend:${BRANCH_NAME} --build-arg REACT_APP_GOOGLE_CLIENTID=${{ secrets.MYR_GOOGLE_OAUTH2 }} .
- name: Push the new image
run: docker push quay.io/umlecg/myr-frontend:${BRANCH_NAME}
- name: Notify the build repository
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.MYR_ACCESS_TOKEN }}
event-type: update_dev
repository: engaging-computing/MYR-build
28 changes: 28 additions & 0 deletions .github/workflows/deploy_prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Deploy production image

on:
push:
branches:
- master

jobs:
update_upstream:
runs-on: ubuntu-latest
container:
image: docker
steps:
- uses: actions/checkout@v1
- name: Set the branch variable
uses: nelonoel/branch-name@v1.0.1
- name: Log into Quay
run: docker login quay.io -u umlecg+myr_bot -p ${{ secrets.QUAY_BOT_PASSWORD }}
- name: Build the docker image
run: docker build -t quay.io/umlecg/myr-frontend:${BRANCH_NAME} --build-arg REACT_APP_GOOGLE_CLIENTID=${{ secrets.MYR_GOOGLE_OAUTH2 }} .
- name: Push the new image
run: docker push quay.io/umlecg/myr-frontend:${BRANCH_NAME}
- name: Notify the build repository
uses: peter-evans/repository-dispatch@v1
with:
token: ${{ secrets.MYR_ACCESS_TOKEN }}
event-type: update_master
repository: engaging-computing/MYR-build
11 changes: 11 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM node:10.13

WORKDIR /app
COPY . /app

ARG REACT_APP_GOOGLE_CLIENTID="totally invalid.apps.googleusercontent.com"
ENV REACT_APP_GOOGLE_CLIENTID ${REACT_APP_GOOGLE_CLIENTID}

RUN npm install
RUN npm run build
RUN npm run doc
14 changes: 10 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,16 @@ The Engaging Computing Group develops new technologies to enable learners—yout
## Status
[![CircleCI](https://circleci.com/gh/engaging-computing/MYR.svg?style=shield)](https://circleci.com/gh/engaging-computing/MYR)

## Change Log - 2.1.1 -> 2.2.0
- Adds Lighting features to MYR
- Adds Texture features to MYR
- Updates copyright in the footer to be in the form `2018 - <current year>`
## Change Log - 2.2.0 -> 2.3.0
- Adds Minecraft style flying controls
- Removes flying setting toggle
- Updates default scene to show helper grid by default
- MYR provided textures are now case insensitive
- Textures can be tiled
- Fixes black flickering bug when entering VR mode on mobile
- Spelling fixes
- Updated AFrame to use v1.x.y



## Acknowledgments
Expand Down
Loading

0 comments on commit 684ffa2

Please sign in to comment.