Skip to content

Commit

Permalink
Fix broken workflows (#3901)
Browse files Browse the repository at this point in the history
  • Loading branch information
Nuru authored Aug 17, 2023
1 parent e2c4747 commit c890d57
Show file tree
Hide file tree
Showing 41 changed files with 308 additions and 291 deletions.
2 changes: 1 addition & 1 deletion .github/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ workflows/%.yml: .ALWAYS
@set -e; enabled=$$(make -sC ../vendor/$* info/package-enabled); \
if [[ $$enabled != "false" ]]; then \
echo updating $@; \
sed 's/%PACKAGE_NAME%/$*/g' package-template.yml > $@; \
sed 's/%PACKAGE_NAME%/$*/g' package-template.yml | sed 's/%PACKAGE_JSON_NAME%/$(subst .,_,$*)/g' > $@; \
else \
echo DELETING workflow $@ because package is disabled; \
rm -f $@; \
Expand Down
20 changes: 10 additions & 10 deletions .github/package-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-%PACKAGE_NAME%:
matrix-%PACKAGE_JSON_NAME%:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-%PACKAGE_NAME%:
needs: matrix-%PACKAGE_NAME%
if: github.event_name != 'schedule' && needs.matrix-%PACKAGE_NAME%.outputs.apk-enabled != 'false'
alpine-%PACKAGE_JSON_NAME%:
needs: matrix-%PACKAGE_JSON_NAME%
if: github.event_name != 'schedule' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-%PACKAGE_NAME%:
needs: matrix-%PACKAGE_NAME%
package-%PACKAGE_JSON_NAME%:
needs: matrix-%PACKAGE_JSON_NAME%
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-%PACKAGE_NAME%.outputs.package-enabled != 'false'
&& needs.matrix-%PACKAGE_NAME%.outputs.package-matrix != '[]' && needs.matrix-%PACKAGE_NAME%.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-enabled != 'false'
&& needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix != '[]' && needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-%PACKAGE_NAME%.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-%PACKAGE_NAME%.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-%PACKAGE_JSON_NAME%.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-%PACKAGE_JSON_NAME%.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/auto-update-packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,18 +124,12 @@ jobs:
- sudosh
- teleport
- terraform
- terraform-0.11
- terraform-0.12
- terraform-0.13
- terraform-0.14
- terraform-0.15
- terraform-1
- terraform-config-inspect
- terraform-docs
- terraform-module-versions
- terraform_0.11
- terraform_0.12
- terraform_0.13
- terragrunt
- terrahelp
- tflint
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.13.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.13:
matrix-kubectl-1_13:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.13:
needs: matrix-kubectl-1.13
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.13.outputs.apk-enabled != 'false'
alpine-kubectl-1_13:
needs: matrix-kubectl-1_13
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_13.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.13:
needs: matrix-kubectl-1.13
package-kubectl-1_13:
needs: matrix-kubectl-1_13
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.13.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.13.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.13.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_13.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_13.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_13.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.13.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.13.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_13.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_13.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.14.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.14:
matrix-kubectl-1_14:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.14:
needs: matrix-kubectl-1.14
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.14.outputs.apk-enabled != 'false'
alpine-kubectl-1_14:
needs: matrix-kubectl-1_14
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_14.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.14:
needs: matrix-kubectl-1.14
package-kubectl-1_14:
needs: matrix-kubectl-1_14
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.14.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.14.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.14.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_14.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_14.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_14.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.14.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.14.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_14.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_14.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.15.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.15:
matrix-kubectl-1_15:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.15:
needs: matrix-kubectl-1.15
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.15.outputs.apk-enabled != 'false'
alpine-kubectl-1_15:
needs: matrix-kubectl-1_15
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_15.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.15:
needs: matrix-kubectl-1.15
package-kubectl-1_15:
needs: matrix-kubectl-1_15
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.15.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.15.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.15.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_15.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_15.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_15.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.15.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.15.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_15.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_15.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.16.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.16:
matrix-kubectl-1_16:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.16:
needs: matrix-kubectl-1.16
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.16.outputs.apk-enabled != 'false'
alpine-kubectl-1_16:
needs: matrix-kubectl-1_16
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_16.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.16:
needs: matrix-kubectl-1.16
package-kubectl-1_16:
needs: matrix-kubectl-1_16
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.16.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.16.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.16.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_16.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_16.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_16.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.16.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.16.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_16.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_16.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.17:
matrix-kubectl-1_17:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.17:
needs: matrix-kubectl-1.17
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.17.outputs.apk-enabled != 'false'
alpine-kubectl-1_17:
needs: matrix-kubectl-1_17
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_17.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.17:
needs: matrix-kubectl-1.17
package-kubectl-1_17:
needs: matrix-kubectl-1_17
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.17.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.17.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.17.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_17.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_17.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_17.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.17.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.17.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_17.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_17.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/kubectl-1.18.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
# so each job must have a unique name for the rules to work properly.
# See https://github.com/Mergifyio/mergify/discussions/5082
# and https://github.com/Mergifyio/mergify/issues/5083
matrix-kubectl-1.18:
matrix-kubectl-1_18:
if: github.event_name != 'schedule'
runs-on: ubuntu-latest
outputs:
Expand All @@ -74,9 +74,9 @@ jobs:
# Build for alpine linux
# Kept separate because it is old and slightly different than the other package builds
alpine-kubectl-1.18:
needs: matrix-kubectl-1.18
if: github.event_name != 'schedule' && needs.matrix-kubectl-1.18.outputs.apk-enabled != 'false'
alpine-kubectl-1_18:
needs: matrix-kubectl-1_18
if: github.event_name != 'schedule' && needs.matrix-kubectl-1_18.outputs.apk-enabled != 'false'
runs-on: ubuntu-latest
strategy:
matrix:
Expand Down Expand Up @@ -156,18 +156,18 @@ jobs:
no-wait-for-sync: 'true' # Skip the waiting for package synchronisation (i.e. upload only)

# Build packages with fpm package manager
package-kubectl-1.18:
needs: matrix-kubectl-1.18
package-kubectl-1_18:
needs: matrix-kubectl-1_18
# Should not be needed, but without these conditions, this job would fail with an error if the matrix is []
# and would run with package-type empty if matrix is ["apk"]
if: >
github.event_name != 'schedule' && needs.matrix-kubectl-1.18.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1.18.outputs.package-matrix != '[]' && needs.matrix-kubectl-1.18.outputs.package-matrix != '["apk"]'
github.event_name != 'schedule' && needs.matrix-kubectl-1_18.outputs.package-enabled != 'false'
&& needs.matrix-kubectl-1_18.outputs.package-matrix != '[]' && needs.matrix-kubectl-1_18.outputs.package-matrix != '["apk"]'
strategy:
matrix:
package-type: ${{ fromJSON(needs.matrix-kubectl-1.18.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1.18.outputs.arch-matrix) }}
package-type: ${{ fromJSON(needs.matrix-kubectl-1_18.outputs.package-matrix) }}
arch: ${{ fromJSON(needs.matrix-kubectl-1_18.outputs.arch-matrix) }}
exclude:
- package-type: 'apk'
include:
Expand Down
Loading

0 comments on commit c890d57

Please sign in to comment.