temporary change forkflow to fix s390x

graphite-project · Feb 22, 2021 · 323ab10 · 323ab10
1 parent 6ecbb2e
commit 323ab10
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/.github/workflows/master-publish.yml b/.github/workflows/master-publish.yml
@@ -3,6 +3,8 @@ name: Build master
 on:
   push:
     branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 env:
   PYPY_IMAGE: jamiehewland/alpine-pypy:3.6-7.3-alpine3.11
@@ -19,31 +21,31 @@ jobs:
           platforms: all
       # Buildx provides an easier way of building Docker images for other architectures
       - uses: docker/setup-buildx-action@master
-      - name: Build amd64 python3 image
-        run: |
-          docker buildx build --platform=linux/amd64 --load -t graphiteapp/graphite-statsd:master .
-      - name: Run Snyk to check amd64 python3 image for vulnerabilities
-        uses: snyk/actions/docker@master
-        env:
-          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
-        with:
-          command: monitor
-          image: graphiteapp/graphite-statsd:master
-          args: --file=Dockerfile --platform=linux/amd64 --project-name=graphite-project/docker-graphite-statsd
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build and push amd64 python3 image to Docker Hub
-        run: |
-          docker buildx build --platform=linux/amd64 --push -t graphiteapp/graphite-statsd:master .
-      - name: Build and push amd64 pypy image to Docker Hub
+      - name: Build s390 python3 image
         run: |
-          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --push -t graphiteapp/graphite-statsd:master-pypy .
-#      - name: Login to ghcr.io
+          docker buildx build --platform=linux/s390x --load -t graphiteapp/graphite-statsd:master .
+#      - name: Run Snyk to check amd64 python3 image for vulnerabilities
+#        uses: snyk/actions/docker@master
+#        env:
+#          SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
+#        with:
+#          command: monitor
+#          image: graphiteapp/graphite-statsd:master
+#          args: --file=Dockerfile --platform=linux/amd64 --project-name=graphite-project/docker-graphite-statsd
+#      - name: Login to DockerHub
+#        uses: docker/login-action@v1
+#        with:
+#          username: ${{ secrets.DOCKER_USERNAME }}
+#          password: ${{ secrets.DOCKER_PASSWORD }}
+#      - name: Build and push amd64 python3 image to Docker Hub
 #        run: |
-#          echo "${{ secrets.GHCR_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
-#      - name: Build and push amd64 pypy image to ghcr.io
+#          docker buildx build --platform=linux/amd64 --push -t graphiteapp/graphite-statsd:master .
+#      - name: Build and push amd64 pypy image to Docker Hub
 #        run: |
-#          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --push -t ghcr.io/graphite-project/graphite-statsd:test-pypy .
+#          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --push -t graphiteapp/graphite-statsd:master-pypy .
+##      - name: Login to ghcr.io
+##        run: |
+##          echo "${{ secrets.GHCR_TOKEN }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
+##      - name: Build and push amd64 pypy image to ghcr.io
+##        run: |
+##          docker buildx build --platform=linux/amd64 --build-arg BASEIMAGE=${PYPY_IMAGE} --build-arg python_binary=/usr/local/bin/pypy3 --push -t ghcr.io/graphite-project/graphite-statsd:test-pypy .