Merge pull request #24 from metal-stack/move-to-ghcr

Move to ghcr.
metal-stack · Nov 23, 2020 · ef896f0 · ef896f0
2 parents 01a8328 + 0561f92
commit ef896f0
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 35 deletions.
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
@@ -9,15 +9,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Docker Image
-      uses: metal-stack/action-docker-make@master
-      with:
-        username: ${{ secrets.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-        args: --no-lint -b master
-    - uses: release-drafter/release-drafter@v5
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout
+        uses: actions/checkout@v2
 
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.32.2
+
+      - name: Docker Image
+        uses: fi-ts/action-docker-make@master
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+          args: --no-lint -b master
+
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -9,14 +9,32 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set tag
-      run: |
-        echo "GIT_TAG_NAME=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV
-    - name: Docker Image
-      uses: metal-stack/action-docker-make@master
-      with:
-        username: ${{ secrets.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-        args: --no-lint -b release
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Figure out if running fork PR
+        id: fork
+        run: '["${{ secrets.DOCKER_REGISTRY_TOKEN }}" == ""] && echo "::set-output name=is_fork_pr::true" || echo "::set-output name=is_fork_pr::false"'
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.32.2
+
+      - name: Set tag
+        run: |
+          echo "GIT_TAG_NAME=${GITHUB_HEAD_REF##*/}" >> $GITHUB_ENV
+
+      - name: Build and push
+        uses: fi-ts/action-docker-make@master
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+          args: --no-lint -b release
+        if: steps.fork.outputs.is_fork_pr == 'false'
+
+      - name: Only Build
+        uses: fi-ts/action-docker-make@master
+        with:
+          args: --no-lint -b release --no-push
+        if: steps.fork.outputs.is_fork_pr == 'true'
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -9,14 +9,21 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set tag
-      run: |
-        echo "GIT_TAG_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
-    - name: Docker Image
-      uses: metal-stack/action-docker-make@master
-      with:
-        username: ${{ secrets.DOCKER_HUB_USER }}
-        password: ${{ secrets.DOCKER_HUB_TOKEN }}
-        args: --no-lint -b release
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Lint
+        uses: golangci/golangci-lint-action@v2
+        with:
+          version: v1.32.2
+
+      - name: Set tag
+        run: |
+          echo "GIT_TAG_NAME=${GITHUB_REF##*/}" >> $GITHUB_ENV
+
+      - name: Docker Image
+        uses: fi-ts/action-docker-make@master
+        with:
+          username: ${{ secrets.DOCKER_REGISTRY_USER }}
+          password: ${{ secrets.DOCKER_REGISTRY_TOKEN }}
+          args: --no-lint -b release
diff --git a/docker-make.yaml b/docker-make.yaml
@@ -1,8 +1,8 @@
 ---
 version: '1'
 name: bmc-catcher
-username: metalstack
-registry-host: docker.io
+username: metal-stack
+registry-host: ghcr.io
 default-build-name: master
 builds:
   -