Merge pull request #64 from opendatahub-io/main

Sync main and release branches

Author: openshift-merge-bot[bot]

.github/actions/free-up-disk-space/action.yml

@@ -12,13 +12,27 @@ runs:
         df -h
         echo "Removing non-essential tools and libraries ..."
         sudo rm -rf /opt/ghc
+        sudo rm -rf /usr/local/.ghcup
         sudo rm -rf /usr/share/dotnet
         # sudo rm -rf /usr/local/share/boost
         echo "Deleting libraries for Android (12G), CodeQL (5.3G), PowerShell (1.3G), Swift (1.7G) ..."
         sudo rm -rf /usr/local/lib/android
         sudo rm -rf "${AGENT_TOOLSDIRECTORY}/CodeQL"
         sudo rm -rf /usr/local/share/powershell
         sudo rm -rf /usr/share/swift
+        # ref: https://github.com/jlumbroso/free-disk-space/blob/main/action.yml
+        echo "Deleting some larger apt packages:"
+        sudo apt-get remove -y '^aspnetcore-.*' || echo "::warning::The command [sudo apt-get remove -y '^aspnetcore-.*'] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y '^dotnet-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^dotnet-.*' --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y '^llvm-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^llvm-.*' --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y 'php.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y 'php.*' --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y '^mongodb-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mongodb-.*' --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y '^mysql-.*' --fix-missing || echo "::warning::The command [sudo apt-get remove -y '^mysql-.*' --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing || echo "::warning::The command [sudo apt-get remove -y azure-cli google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y google-cloud-sdk --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-sdk --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get remove -y google-cloud-cli --fix-missing || echo "::debug::The command [sudo apt-get remove -y google-cloud-cli --fix-missing] failed to complete successfully. Proceeding..."
+        sudo apt-get autoremove -y || echo "::warning::The command [sudo apt-get autoremove -y] failed to complete successfully. Proceeding..."
+        sudo apt-get clean || echo "::warning::The command [sudo apt-get clean] failed to complete successfully. Proceeding..."
         echo "Disk usage after cleanup:"
         df -h
 

.github/workflows/build.yml

@@ -22,9 +22,8 @@ defaults:
     shell: bash
 
 env:
-  CI: true
-  SERVER_IMAGE_NAME: "text-gen-server:0"
-  SERVER_IMAGE: "ghcr.io/ibm/text-gen-server:latest"  # TODO: consider publishing to quay.io or icr.io instead
+  SERVER_IMAGE: "quay.io/wxpe/text-gen-server"
+  IMAGE_REGISTRY: "quay.io"
 
 jobs:
   build:
@@ -50,8 +49,17 @@ jobs:
       - name: "Set up Docker Buildx"
         uses: docker/setup-buildx-action@v3
 
-      - name: "Log in to cache image container registry"
+      - name: "Log in to container registry (server-release)"
         uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
+        with:
+          registry: ${{ env.IMAGE_REGISTRY }}
+          username: ${{ secrets.WXPE_QUAY_USER }}
+          password: ${{ secrets.WXPE_QUAY_TOKEN }}
+
+      - name: "Log in to container registry (cache image)"
+        uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
           registry: ${{ env.CACHE_REGISTRY }}
           username: ${{ github.actor }}
@@ -78,12 +86,25 @@ jobs:
           fi
           echo "CACHE_TO=$CACHE_TO" >> $GITHUB_ENV
 
+      - name: "Generate tags"
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: |
+            ${{ env.SERVER_IMAGE }}
+          tags: |
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=sha,enable=true,priority=100,prefix=,suffix=,format=short     
+            type=sha,enable=true,priority=100,prefix=${{ github.ref_name }}.,suffix=,format=short     
+
       - name: "Docker build server-release"
         uses: docker/build-push-action@v5
         with:
           context: .
           target: server-release
-          tags: ${{ env.SERVER_IMAGE }}
+          tags: ${{ steps.meta.outputs.tags }}
           cache-from: type=registry,ref=${{ env.CACHE_IMAGE }}
           cache-to: ${{ env.CACHE_TO }}
           push: ${{ github.event_name != 'pull_request' }}

.github/workflows/test.yml

@@ -47,6 +47,7 @@ jobs:
 
       - name: "Log in to cache image container registry"
         uses: docker/login-action@v3
+        if: github.event_name != 'pull_request'
         with:
           registry: ${{ env.CACHE_REGISTRY }}
           username: ${{ github.actor }}

.gitignore

@@ -1,3 +1,4 @@
 .idea
 target
-router/src/pb/
+router/src/pb
+router/client/src/pb