Merge branch 'master' into release #25

	name: Build and deploy

	on:
	push:
	branches: release

	jobs:
	Build-and-push-container:
	runs-on: ubuntu-latest
	steps:
	-
	name: Checkout
	uses: actions/checkout@v2
	with:
	ref: release
	-
	name: Set up QEMU
	uses: docker/setup-qemu-action@v1
	-
	name: Set up Docker Buildx
	uses: docker/setup-buildx-action@v1
	-
	name: Login to DockerHub
	uses: docker/login-action@v1
	with:
	username: ${{ secrets.DOCKERHUB_USERNAME }}
	password: ${{ secrets.DOCKERHUB_TOKEN }}
	-
	name: Build and push
	id: docker_build
	uses: docker/build-push-action@v2
	with:
	push: true
	tags: booterman/malla-interactiva
	Build-and-deploy-gbpages:
	# The type of runner that the job will run on
	runs-on: ubuntu-latest

	# Steps represent a sequence of tasks that will be executed as part of the job
	steps:
	# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
	- uses: actions/checkout@v2
	- uses: fregante/setup-git-user@v1
	- uses: actions/setup-node@v2
	# Runs a single command using the runners shell
	- name: Install and Build
	run: \|
	npm install
	npm run gbpages
	- name: Deploy to pages
	uses: JamesIves/[email protected]
	with:
	GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
	BRANCH: gh-pages # The branch the action should deploy to.
	FOLDER: . # The folder the action should deploy.

Provide feedback