diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 26700ed..32338c2 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -1,11 +1,20 @@ name: Build docker on: + push: + branches: + - main + pull_request: + branches: + - main + release: + types: + - created workflow_dispatch: env: REGISTRY: ghcr.io - IMAGE_NAME: sc64env + IMAGE_NAME: polprzewodnikowy/sc64env jobs: build-and-push-image: @@ -34,7 +43,7 @@ jobs: - name: Build and push Docker image uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc with: - context: . + context: ./docker push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index be46a87..5aeceef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,11 +2,14 @@ name: Build fw/hw/sw on: push: - branches: [ main ] + branches: + - main pull_request: - branches: [ main ] + branches: + - main release: - types: [ created ] + types: + - created workflow_dispatch: jobs: diff --git a/README.md b/README.md index 2603b3c..667cbc5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# SummerCollection [![Build Status](https://travis-ci.org/Polprzewodnikowy/SummerCollection.svg?branch=main)](https://travis-ci.org/Polprzewodnikowy/SummerCollection) +# SummerCollection A collection of hardware, firmware and software designs of SummerCart64 - Nintendo 64 FlashCart/DevKit. diff --git a/build.sh b/build.sh index 43bb47d..aff53b9 100755 --- a/build.sh +++ b/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker run --mount type=bind,src="$(pwd)",target="/workdir" polprzewodnikowy/sc64env:0.9 /bin/bash ./docker/build.sh +docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash ./docker/build.sh diff --git a/sw/n64/build.sh b/sw/n64/build.sh index 0a82fbd..5196c38 100755 --- a/sw/n64/build.sh +++ b/sw/n64/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker run --mount type=bind,src="$(pwd)",target="/workdir" polprzewodnikowy/sc64env:0.9 /bin/bash -c "make clean all" +docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash -c "make clean all" diff --git a/sw/riscv/build.sh b/sw/riscv/build.sh index 0a82fbd..5196c38 100755 --- a/sw/riscv/build.sh +++ b/sw/riscv/build.sh @@ -1,3 +1,3 @@ #!/bin/bash -docker run --mount type=bind,src="$(pwd)",target="/workdir" polprzewodnikowy/sc64env:0.9 /bin/bash -c "make clean all" +docker run --mount type=bind,src="$(pwd)",target="/workdir" ghcr.io/polprzewodnikowy/sc64env:v0.9 /bin/bash -c "make clean all"