Workflows (#13)

* use my GH func action * fix Signed-off-by: David Fridrich <[email protected]> * manual wf fix * update manual * fix Signed-off-by: David Fridrich <[email protected]> * manual update * manual update * manual wf fix * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> * fix Signed-off-by: David Fridrich <[email protected]> --------- Signed-off-by: David Fridrich <[email protected]>
gauron99 · Dec 11, 2024 · 1e5e849 · 1e5e849
1 parent 3f81a4f
commit 1e5e849
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 50 deletions.
diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml
@@ -6,18 +6,16 @@ jobs:
   builds:
     runs-on: ubuntu-latest
     env:
-      VERSION: "v1.15.1"
+      FUNC_VERSION: "v1.16.1"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install func
-      run: |
-        echo "Installing func ${{env.VERSION}}"
-        program_url="https://github.com/knative/func/releases/download/knative-${{env.VERSION}}/func_linux_amd64"
-        curl -SLO $program_url && mv func_linux_amd64 f && chmod +x f
-        cp f /usr/local/bin
-        f version
+      uses: gauron99/knative-func-action@main
+      with:
+        version: ${{ FUNC_VERSION }}
+        name: f
 
     - name: Build Functions
       run: |

diff --git a/.github/workflows/main-build-all.yaml b/.github/workflows/main-build-all.yaml
@@ -8,18 +8,16 @@ jobs:
   builds:
     runs-on: ubuntu-latest
     env:
-      VERSION: "v1.15.1"
+      FUNC_VERSION: "knative-v1.16.1"
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install func
-      run: |
-        echo "Installing func ${{env.VERSION}}"
-        program_url="https://github.com/knative/func/releases/download/knative-${{env.VERSION}}/func_linux_amd64"
-        curl -SLO $program_url && mv func_linux_amd64 f && chmod +x f
-        cp f /usr/local/bin
-        f version
+      uses: gauron99/knative-func-action@main
+        with:
+          version: ${{FUNC_VERSION}}
+          name: f
 
     - name: Build Functions
       run: |

diff --git a/.github/workflows/manual-workflow.yml b/.github/workflows/manual-workflow.yml
@@ -3,52 +3,67 @@ name: Manual Flow Testing
 on: workflow_dispatch
 
 jobs:
-  builds:
+  prepare:
     runs-on: ubuntu-latest
+    outputs:
+      languages: ${{ steps.prep-matrix.outputs.languages }}
+      language_paths: ${{ steps.prep-matrix.outputs.language_paths }}
+    env:
+      FUNC_VERSION: "knative-v1.16.1"
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Prep Matrix
+      id: prep-matrix
+      run: |
+        ## NOTE: ls -d returns absolute path
+        ## GITHUB_WORKSPACE is the root directory
+        language_paths="$(ls -d ${GITHUB_WORKSPACE}/*/ | jq -R -s 'split("\n")[:-1]')" 
+        languages="$(ls -d ${GITHUB_WORKSPACE}/*/ | xargs -n 1 basename | jq -R -s 'split("\n")[:-1]')"
+
+        # set output
+        echo language_paths=$language_paths >> $GITHUB_OUTPUT
+        echo languages=$languages >> $GITHUB_OUTPUT
+
+  deploy:
+    needs: prepare
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        language: ${{ fromJSON(needs.prepare.outputs.languages) }}
     env:
-      VERSION: "v1.15.1"
       ACTIONS_STEP_DEBUG: true
+      language_paths: ${{needs.prepare.outputs.language_paths}}
     steps:
     - name: Checkout code
       uses: actions/checkout@v4
 
     - name: Install func
-      run: |
-        echo "Installing func ${{env.VERSION}}"
-        program_url="https://github.com/knative/func/releases/download/knative-${{env.VERSION}}/func_linux_amd64"
-        curl -SLO $program_url && mv func_linux_amd64 f && chmod +x f
-        cp f /usr/local/bin
-        f version
+      uses: gauron99/knative-func-action@main
+      with:
+        version: ${{ env.FUNC_VERSION }}
+        name: f
 
     - name: Build Functions
       run: |
+        language=${{matrix.language}}
+        echo "Current language: $language"
+        
+        # This takes the array of paths, wraps it in single quotes for jq, then
+        # selects only the value that matches with language to get current
+        # language AND its full path (where the func template is)
+        language_path=$(echo '${{env.language_paths}}' | jq -r ".[] | select(contains(\"${{matrix.language}}\"))")
+
+        url="https://github.com/gauron99/func-templates"
         WORKDIR=$(mktemp -d)
         cd $WORKDIR
-        echo "did the cd work?"
-        pwd
-        ## NOTE: ls -d returns absolute path
-        ## GITHUB_WORKSPACE is the root directory 
-        #cycle through all languages
-        url="http://github.com/gauron99/func-templates"
-        for lang_dir_abs in $(ls -d ${GITHUB_WORKSPACE}/*/); do
-          lang=$(basename "$lang_dir_abs")
-          echo "Building funcs in language $lang"
-          for template_dir_abs in $(ls -d $lang_dir_abs*/); do
-            echo "ls -la"
-            ls -la
-            echo "pwd"
-            pwd
-            echo "ls -la ${GITHUB_WORKSPACE}"
-            ls -la ${GITHUB_WORKSPACE}
-            template=$(basename "$template_dir_abs")
-            echo "f create $lang-$template -r=$url -l=$lang -t=$template"
-            if [ $lang = "python" ];then
-              f create $lang-$template -r "$url" 
-            else
-              f create $lang-$template -r "$url" -l "$lang" -t "$template"
-            fi
-            #FUNC_ENABLE_HOST_BUILDER=1 FUNC_BUILDER=host FUNC_CONTAINER=false FUNC_REGISTRY=docker.io/4141gauron3268 f 
-          done
-        done
-
-
+        echo "Building funcs in language ${{matrix.language}}"
+        for template_dir_abs in $(ls -d $language_path*/); do
+          echo "ls -la ${GITHUB_WORKSPACE}"
+          ls -la ${GITHUB_WORKSPACE}
+          template=$(basename "$template_dir_abs")
+          echo "f create $language-$template -r=$url -l=$language -t=$template"
+          f create $language-$template -r "$url" -l "$language" -t "$template"
+          #FUNC_ENABLE_HOST_BUILDER=1 FUNC_BUILDER=host FUNC_CONTAINER=false FUNC_REGISTRY=docker.io/4141gauron3268 f
+        done