diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 3ba2323..2a60b37 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -9,7 +9,7 @@ jobs: - uses: actions/checkout@v3 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./libraries build-lib: runs-on: ubuntu-22.04 needs: clang-format-lib @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v3 - name: clang-format run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./example/example_module/source + docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./example/example_module/source build-examples: runs-on: ubuntu-22.04 needs: clang-format-examples diff --git a/.github/workflows/push_image.yml b/.github/workflows/push_image.yml index cb8ddd4..a69fa5e 100644 --- a/.github/workflows/push_image.yml +++ b/.github/workflows/push_image.yml @@ -3,57 +3,41 @@ on: push: branches: - main + +env: + REGISTRY: ghcr.io + IMAGE_NAME: ${{ github.repository }} + jobs: - clang-format-lib: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - name: clang-format - run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries - build-lib: - runs-on: ubuntu-22.04 - needs: clang-format-lib - steps: - - uses: actions/checkout@v3 - - name: build binary - run: | - docker build . -f Dockerfile.buildlocal -t builder - docker run --rm -v ${PWD}:/project builder make - clang-format-examples: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - name: clang-format - run: | - docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./example/example_module/source - build-examples: - runs-on: ubuntu-22.04 - needs: clang-format-examples - steps: - - uses: actions/checkout@v3 - - name: build binary - run: | - docker build . -f Dockerfile.buildexamples -t builder - cd ./example/example_module - docker run --rm -v ${PWD}:/project builder make - push_image: + build-and-push-image: runs-on: ubuntu-latest - needs: [build-lib, build-examples] + permissions: + contents: read + packages: write + steps: - - uses: actions/checkout@master - - name: Get release version - id: get_release_tag - run: | - echo RELEASE_VERSION=$(echo $(date '+%Y%m%d')) >> $GITHUB_ENV - echo REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//" | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - echo REPOSITORY_OWNER=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $1}' | sed 's/[^a-zA-Z0-9]//g' | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV - - name: Publish to Registry - uses: elgohr/Publish-Docker-Github-Action@master - with: - name: ${{ env.REPOSITORY_OWNER }}/${{ env.REPOSITORY_NAME }} - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - snapshot: true - cache: true - tags: "latest, ${{ env.RELEASE_VERSION }}" \ No newline at end of file + - name: Checkout repository + uses: actions/checkout@v3 + - name: Extract Docker metadata + id: meta + uses: docker/metadata-action@v4 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + tags: | + type=raw,value={{date 'YYYYMMDD'}}-{{sha}} + type=raw,value={{date 'YYYYMMDD'}} + type=raw,value=latest + - name: Log into registry ${{ env.REGISTRY }} + uses: docker/login-action@v2.1.0 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.CI_PAT_WRITE_PACKAGE }} + + - name: Build and push Docker image + uses: docker/build-push-action@v4 + with: + context: . + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + push: true \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 750f48c..feb051d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20220806 WORKDIR build COPY . . diff --git a/Dockerfile.buildexamples b/Dockerfile.buildexamples index 053ecb3..e9ff128 100644 --- a/Dockerfile.buildexamples +++ b/Dockerfile.buildexamples @@ -1,4 +1,4 @@ -FROM wiiuenv/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20220806 WORKDIR build COPY . . @@ -8,7 +8,7 @@ WORKDIR /artifacts FROM scratch as libwums COPY --from=0 /artifacts /artifacts -FROM wiiuenv/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20220806 COPY --from=libwums /artifacts $DEVKITPRO diff --git a/Dockerfile.buildlocal b/Dockerfile.buildlocal index 08fc052..90b5bdb 100644 --- a/Dockerfile.buildlocal +++ b/Dockerfile.buildlocal @@ -1,3 +1,3 @@ -FROM wiiuenv/devkitppc:20220806 +FROM ghcr.io/wiiu-env/devkitppc:20220806 WORKDIR project \ No newline at end of file diff --git a/README.MD b/README.MD index 7052f31..863395f 100644 --- a/README.MD +++ b/README.MD @@ -68,13 +68,13 @@ if (OSDynLoad_FindExport(sModuleHandle, FALSE, "MyCustomFunction", (void**) &sMy A prebuilt version of this lib can found on dockerhub. To use it for your projects, add this to your Dockerfile. ```Dockerfile [...] -COPY --from=wiiuenv/wiiumodulesystem:[tag] /artifacts $DEVKITPRO +COPY --from=ghcr.io/wiiu-env/wiiumodulesystem:[tag] /artifacts $DEVKITPRO [...] ``` -Replace [tag] with a tag you want to use, a list of tags can be found [here](https://hub.docker.com/r/wiiuenv/wiiumodulesystem/tags). +Replace [tag] with a tag you want to use, a list of tags can be found [here](https://github.com/orgs/wiiu-env/packages/container/wiiumodulesystem/versions). It's highly recommended to pin the version to the **latest date** instead of using `latest`. ## Format the code via docker ```bash -docker run --rm -v ${PWD}:/src wiiuenv/clang-format:13.0.0-2 -r ./include ./libraries ./example/example_module/source -i +docker run --rm -v ${PWD}:/src ghcr.io/wiiu-env/clang-format:13.0.0-2 -r ./include ./libraries ./example/example_module/source -i ```