From b47cd11029fab50a4709ac3f9b45f539ea78b60a Mon Sep 17 00:00:00 2001 From: Logan Drescher <106617880+CodeByDrescher@users.noreply.github.com> Date: Thu, 25 Jan 2024 12:39:26 -0500 Subject: [PATCH] Adding Mac and Docker back to gh action --- .github/workflows/cd.yml | 65 ++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 58e80fa4..1c7cc1da 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -7,36 +7,36 @@ env: IMAGE_NAME: ${{ github.repository }} jobs: -# build-and-push-image: -# runs-on: ubuntu-latest -# permissions: -# contents: read -# packages: write -# -# steps: -# - name: Checkout repository -# uses: actions/checkout@v3 -# -# - name: Log in to the Container registry -# uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 -# with: -# registry: ${{ env.REGISTRY }} -# username: ${{ github.actor }} -# password: ${{ secrets.GITHUB_TOKEN }} -# -# - name: Extract metadata (tags, labels) for Docker -# id: meta -# uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 -# with: -# images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} -# -# - name: Build and push Docker image -# uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc -# with: -# context: . -# push: true -# tags: ${{ steps.meta.outputs.tags }} -# labels: ${{ steps.meta.outputs.labels }} + build-and-push-image: + runs-on: ubuntu-latest + permissions: + contents: read + packages: write + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Log in to the Container registry + uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + + - name: Build and push Docker image + uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + with: + context: . + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} native-build: name: @@ -44,9 +44,8 @@ jobs: strategy: fail-fast: false matrix: - platform: [ubuntu-latest, windows-latest] -# platform: [macos-latest, windows-latest, ubuntu-latest] -# platform: [macos-latest] + platform: [macos-latest, windows-latest, ubuntu-latest] + runs-on: ${{ matrix.platform }}