diff --git a/.github/workflows/bump-version.yaml b/.github/workflows/bump-version.yaml index 1ff6ae8..4202392 100644 --- a/.github/workflows/bump-version.yaml +++ b/.github/workflows/bump-version.yaml @@ -13,7 +13,7 @@ jobs: git-token: ${{ secrets.GITHUB_TOKEN }} fail: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 if: github.event.action == 'failure' steps: - name: Exit with error diff --git a/.github/workflows/internal-cd.yaml b/.github/workflows/internal-cd.yaml index 2c1ebb9..1748ec8 100644 --- a/.github/workflows/internal-cd.yaml +++ b/.github/workflows/internal-cd.yaml @@ -18,7 +18,7 @@ jobs: generate-minor: false trigger-p2p-build: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [internal-version] env: ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }} diff --git a/.github/workflows/internal-ci.yaml b/.github/workflows/internal-ci.yaml index a15bce4..c1d001d 100644 --- a/.github/workflows/internal-ci.yaml +++ b/.github/workflows/internal-ci.yaml @@ -14,7 +14,7 @@ jobs: dry-run: true print-version: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: increment-version steps: - env: @@ -36,7 +36,7 @@ jobs: with: dry-run: true uses: ./.github/workflows/p2p-version.yaml - + test_execute_command: needs: [test_version] uses: ./.github/workflows/p2p-execute-command.yaml @@ -70,7 +70,7 @@ jobs: test_extended_test: uses: ./.github/workflows/p2p-workflow-extended-test.yaml - needs: [get_image_extended_test] + needs: [get_image_extended_test] secrets: env_vars: | TEST_VARIABLE=value diff --git a/.github/workflows/internal-version.yaml b/.github/workflows/internal-version.yaml index 227686f..a582d6c 100644 --- a/.github/workflows/internal-version.yaml +++ b/.github/workflows/internal-version.yaml @@ -1,4 +1,3 @@ - name: increment-version on: @@ -27,25 +26,25 @@ on: jobs: increment-version: name: increment-version - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: version: ${{ steps.setversion.outputs.patch }} - + steps: - uses: actions/checkout@v4 with: - fetch-depth: 0 + fetch-depth: 0 - name: Configure Git run: | git config user.name "$GITHUB_ACTOR" - git config user.email "$GITHUB_ACTOR@users.noreply.github.com" - + git config user.email "$GITHUB_ACTOR@users.noreply.github.com" + - name: Get Previous tag id: previoustag shell: bash run: | - git tag | sort -r --version-sort | head -n1 - echo "tag=$(git tag | sort -r --version-sort | head -n1)" >> "$GITHUB_OUTPUT" + git tag | sort -r --version-sort | head -n1 + echo "tag=$(git tag | sort -r --version-sort | head -n1)" >> "$GITHUB_OUTPUT" env: GITHUB_TOKEN: ${{ secrets.git-token }} @@ -59,7 +58,7 @@ jobs: id: semvers uses: "WyriHaximus/github-action-next-semvers@v1" with: - version: ${{ inputs.override != '' && inputs.override || steps.previousversion.outputs.version }} + version: ${{ inputs.override != '' && inputs.override || steps.previousversion.outputs.version }} - name: Set bumped version in output id: setversion @@ -68,7 +67,6 @@ jobs: echo "patch=${{ steps.semvers.outputs.patch }}" >> "$GITHUB_OUTPUT" echo "minor=${{ steps.semvers.outputs.patch }}" | cut -d. -f1,2 >> "$GITHUB_OUTPUT" echo "major=${{ steps.semvers.outputs.patch }}" | cut -d. -f1 >> "$GITHUB_OUTPUT" - - name: Show the tags shell: bash @@ -100,4 +98,3 @@ jobs: with: tag: v${{ steps.setversion.outputs.patch }} tag_exists_error: true - diff --git a/.github/workflows/p2p-execute-command.yaml b/.github/workflows/p2p-execute-command.yaml index 8f620b6..71cad6b 100644 --- a/.github/workflows/p2p-execute-command.yaml +++ b/.github/workflows/p2p-execute-command.yaml @@ -50,11 +50,10 @@ on: type: string default: '.' - jobs: exec: name: '${{ inputs.command }} (${{ inputs.github_env }})' - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 environment: ${{ inputs.github_env }} env: env_vars: ${{ secrets.env_vars }} @@ -87,10 +86,10 @@ jobs: if: ${{ inputs.optional == true }} working-directory: ${{ inputs.working-directory }} id: is_optional - run: | + run: | declare -r optional_target=${{ inputs.command }} # match target in format: `.PHONY: `, skip if commented out - if grep "^[^#]*.PHONY.*${optional_target}.*" ./Makefile; then + if grep "^[^#]*.PHONY.*${optional_target}.*" ./Makefile; then echo "SKIP=false" >> $GITHUB_ENV else echo "WARNING: No Makefile target [$optional_target], skipping job" @@ -146,7 +145,7 @@ jobs: done - name: Install iapc - uses: jaxxstorm/action-install-gh-release@v1.10.0 + uses: jaxxstorm/action-install-gh-release@v1 with: repo: cedws/iapc tag: v0.1.9 diff --git a/.github/workflows/p2p-get-latest-image-extended-test.yaml b/.github/workflows/p2p-get-latest-image-extended-test.yaml index 33487a1..f32d126 100644 --- a/.github/workflows/p2p-get-latest-image-extended-test.yaml +++ b/.github/workflows/p2p-get-latest-image-extended-test.yaml @@ -1,4 +1,3 @@ - on: workflow_call: secrets: diff --git a/.github/workflows/p2p-get-latest-image-prod.yaml b/.github/workflows/p2p-get-latest-image-prod.yaml index 43e2196..7576e3a 100644 --- a/.github/workflows/p2p-get-latest-image-prod.yaml +++ b/.github/workflows/p2p-get-latest-image-prod.yaml @@ -1,4 +1,3 @@ - on: workflow_call: secrets: diff --git a/.github/workflows/p2p-get-latest-image.yaml b/.github/workflows/p2p-get-latest-image.yaml index 352defe..3d36459 100644 --- a/.github/workflows/p2p-get-latest-image.yaml +++ b/.github/workflows/p2p-get-latest-image.yaml @@ -33,11 +33,10 @@ on: required: true type: string - jobs: get-latest-image: name: get-latest-image - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 outputs: version: ${{ steps.get-latest-image.outputs.version }} environment: ${{ fromJson(inputs.environment).include[0]['deploy_env'] }} @@ -84,6 +83,6 @@ jobs: working-directory: ${{ inputs.working-directory }} run: | [ $DRY_RUN == false ] && version=$(gcloud container images list-tags ${REGISTRY}/${REGISTRY_PATH}/${IMAGE_NAME} --limit=1 --format=json ) - [ $? -gt 0 ] && [ $DRY_RUN == false ] && echo "exiting" && exit 1 + [ $? -gt 0 ] && [ $DRY_RUN == false ] && echo "exiting" && exit 1 [ $DRY_RUN == true ] && version="[{\"tags\": [\"0.0.0\"]}]" echo "version=$(echo ${version} | jq -r '.[0].tags[0]')" >> "$GITHUB_OUTPUT" diff --git a/.github/workflows/p2p-promote-image.yaml b/.github/workflows/p2p-promote-image.yaml index 6a838b9..2e76a1d 100644 --- a/.github/workflows/p2p-promote-image.yaml +++ b/.github/workflows/p2p-promote-image.yaml @@ -46,10 +46,9 @@ on: required: false type: string - jobs: lookup: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 environment: ${{ fromJson(inputs.source_matrix).include[0]['deploy_env'] }} env: REGISTRY: ${{ inputs.region }}-docker.pkg.dev/${{ vars.PROJECT_ID }}/tenant/${{ vars.TENANT_NAME }} @@ -68,7 +67,7 @@ jobs: promote-image: name: promote-to-${{ inputs.promotion-stage }} - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 needs: [lookup] environment: ${{ inputs.dest_github_env }} env: @@ -99,7 +98,7 @@ jobs: yq -p=json -C <> "$GITHUB_OUTPUT" - + echo "tag=$PREVIOUS_VERSION" >> "$GITHUB_OUTPUT" - name: get previous version from tag id: previousversion @@ -74,7 +72,7 @@ jobs: id: semvers uses: "WyriHaximus/github-action-next-semvers@v1" with: - version: ${{ steps.previousversion.outputs.version }} + version: ${{ steps.previousversion.outputs.version }} - name: get git hashes id: githashes @@ -110,7 +108,7 @@ jobs: TAG=${{ steps.semvers.outputs.patch }} PREVIOUS_TAG=${{ steps.previousversion.outputs.version }} - + HASH=${{ steps.githashes.outputs.current_hash }} LAST_TAG_HASH=${{ steps.githashes.outputs.previous_tag_hash }} diff --git a/.github/workflows/p2p-workflow-extended-test.yaml b/.github/workflows/p2p-workflow-extended-test.yaml index 1ca29cc..512ab87 100644 --- a/.github/workflows/p2p-workflow-extended-test.yaml +++ b/.github/workflows/p2p-workflow-extended-test.yaml @@ -1,4 +1,3 @@ - on: workflow_call: secrets: @@ -41,7 +40,7 @@ on: type: string env: - REGION: ${{ inputs.region }} + REGION: ${{ inputs.region }} jobs: run-tests: diff --git a/.github/workflows/p2p-workflow-fastfeedback.yaml b/.github/workflows/p2p-workflow-fastfeedback.yaml index ff3c811..ad90605 100644 --- a/.github/workflows/p2p-workflow-fastfeedback.yaml +++ b/.github/workflows/p2p-workflow-fastfeedback.yaml @@ -1,4 +1,3 @@ - on: workflow_call: secrets: @@ -17,7 +16,7 @@ on: required: false type: string default: '' - version: + version: required: true type: string region: @@ -43,9 +42,8 @@ on: version: value: ${{ inputs.version }} - env: - REGION: ${{ inputs.region }} + REGION: ${{ inputs.region }} jobs: build: @@ -132,5 +130,3 @@ jobs: working-directory: ${{ inputs.working-directory }} connect-to-k8s: true corectl-version: ${{ inputs.corectl-version }} - - diff --git a/.github/workflows/p2p-workflow-prod.yaml b/.github/workflows/p2p-workflow-prod.yaml index 222aec0..8682396 100644 --- a/.github/workflows/p2p-workflow-prod.yaml +++ b/.github/workflows/p2p-workflow-prod.yaml @@ -1,4 +1,3 @@ - on: workflow_call: secrets: @@ -30,7 +29,6 @@ on: type: string default: 'v' - jobs: prod-deploy: name: prod-deploy @@ -48,5 +46,3 @@ jobs: dry-run: ${{ inputs.dry-run }} working-directory: ${{ inputs.working-directory }} checkout-version: ${{ inputs.version-prefix }}${{ inputs.version }} - -