Skip to content

Commit 7581d21

Browse files
DavidSDavidS
committed
Update to newest template version
1 parent ae52c22 commit 7581d21

File tree

6 files changed

+95
-107
lines changed

6 files changed

+95
-107
lines changed

‎.github/workflows/nightly.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717

1818
steps:
1919
- name: "Honeycomb: Start recording"
20-
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected]
20+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
2121
with:
2222
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
2323
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -90,7 +90,7 @@ jobs:
9090
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
9191
9292
- name: "Honeycomb: Start recording"
93-
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected]
93+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9494
with:
9595
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9696
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -207,7 +207,7 @@ jobs:
207207
runs-on: ubuntu-20.04
208208
steps:
209209
- name: Slack Workflow Notification
210-
uses: Gamesight/slack-workflow-status@88ee95b73b4669825883ddf22747966204663e58 # pin@master
210+
uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
211211
with:
212212
# Required Input
213213
repo_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/pr_test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
steps:
1717
- name: "Honeycomb: Start recording"
18-
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected]
18+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
1919
with:
2020
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
2121
dataset: ${{ env.HONEYCOMB_DATASET }}
@@ -57,7 +57,6 @@ jobs:
5757
5858
- name: Setup Acceptance Test Matrix
5959
id: get-matrix
60-
if: ${{ github.repository_owner == 'puppetlabs' }}
6160
run: |
6261
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
6362
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata
@@ -73,6 +72,7 @@ jobs:
7372
Acceptance:
7473
needs:
7574
- setup_matrix
75+
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
7676

7777
runs-on: ubuntu-20.04
7878
strategy:
@@ -88,7 +88,7 @@ jobs:
8888
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
8989
9090
- name: "Honeycomb: Start recording"
91-
uses: kvrhdn/gha-buildevents@5be4636b81803713c94d7cb7e3a4b85d759df112 # [email protected]
91+
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
9292
with:
9393
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
9494
dataset: ${{ env.HONEYCOMB_DATASET }}

‎.rubocop.yml‎

Lines changed: 50 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -82,66 +82,26 @@ Performance/BigDecimalWithNumericArgument:
8282
Enabled: true
8383
Performance/BlockGivenWithExplicitBlock:
8484
Enabled: true
85-
Performance/Caller:
86-
Enabled: true
8785
Performance/CaseWhenSplat:
8886
Enabled: true
89-
Performance/Casecmp:
90-
Enabled: true
91-
Performance/CollectionLiteralInLoop:
92-
Enabled: true
93-
Performance/CompareWithBlock:
94-
Enabled: true
9587
Performance/ConstantRegexp:
9688
Enabled: true
97-
Performance/Count:
98-
Enabled: true
99-
Performance/Detect:
100-
Enabled: true
101-
Performance/DoubleStartEndWith:
102-
Enabled: true
103-
Performance/EndWith:
104-
Enabled: true
105-
Performance/FixedSize:
106-
Enabled: true
107-
Performance/FlatMap:
108-
Enabled: true
10989
Performance/MethodObjectAsBlock:
11090
Enabled: true
111-
Performance/RangeInclude:
112-
Enabled: true
113-
Performance/RedundantBlockCall:
114-
Enabled: true
115-
Performance/RedundantMatch:
116-
Enabled: true
117-
Performance/RedundantMerge:
118-
Enabled: true
11991
Performance/RedundantSortBlock:
12092
Enabled: true
12193
Performance/RedundantStringChars:
12294
Enabled: true
123-
Performance/RegexpMatch:
124-
Enabled: true
125-
Performance/ReverseEach:
126-
Enabled: true
12795
Performance/ReverseFirst:
12896
Enabled: true
129-
Performance/Size:
130-
Enabled: true
13197
Performance/SortReverse:
13298
Enabled: true
13399
Performance/Squeeze:
134100
Enabled: true
135-
Performance/StartWith:
136-
Enabled: true
137101
Performance/StringInclude:
138102
Enabled: true
139-
Performance/StringReplacement:
140-
Enabled: true
141103
Performance/Sum:
142104
Enabled: true
143-
Performance/TimesMap:
144-
Enabled: true
145105
Style/CollectionMethods:
146106
Enabled: true
147107
Style/MethodCalledOnDoEndBlock:
@@ -198,20 +158,12 @@ Lint/DeprecatedOpenSSLConstant:
198158
Enabled: false
199159
Lint/DisjunctiveAssignmentInConstructor:
200160
Enabled: false
201-
Lint/DuplicateBranch:
202-
Enabled: false
203161
Lint/DuplicateElsifCondition:
204162
Enabled: false
205-
Lint/DuplicateRegexpCharacterClassElement:
206-
Enabled: false
207163
Lint/DuplicateRequire:
208164
Enabled: false
209165
Lint/DuplicateRescueException:
210166
Enabled: false
211-
Lint/EmptyBlock:
212-
Enabled: false
213-
Lint/EmptyClass:
214-
Enabled: false
215167
Lint/EmptyConditionalBody:
216168
Enabled: false
217169
Lint/EmptyFile:
@@ -232,8 +184,6 @@ Lint/MixedRegexpCaptureTypes:
232184
Enabled: false
233185
Lint/NestedPercentLiteral:
234186
Enabled: false
235-
Lint/NoReturnInBeginEndBlocks:
236-
Enabled: false
237187
Lint/NonDeterministicRequireOrder:
238188
Enabled: false
239189
Lint/OrderedMagicComments:
@@ -268,18 +218,12 @@ Lint/ShadowedArgument:
268218
Enabled: false
269219
Lint/StructNewOverride:
270220
Enabled: false
271-
Lint/ToEnumArguments:
272-
Enabled: false
273221
Lint/ToJSON:
274222
Enabled: false
275223
Lint/TopLevelReturnWithArgument:
276224
Enabled: false
277225
Lint/TrailingCommaInAttributeDeclaration:
278226
Enabled: false
279-
Lint/UnexpectedBlockArity:
280-
Enabled: false
281-
Lint/UnmodifiedReduceAccumulator:
282-
Enabled: false
283227
Lint/UnreachableLoop:
284228
Enabled: false
285229
Lint/UriEscapeUnescape:
@@ -294,6 +238,8 @@ Metrics/AbcSize:
294238
Enabled: false
295239
Metrics/BlockLength:
296240
Enabled: false
241+
Metrics/BlockNesting:
242+
Enabled: false
297243
Metrics/ClassLength:
298244
Enabled: false
299245
Metrics/CyclomaticComplexity:
@@ -308,6 +254,8 @@ Metrics/PerceivedComplexity:
308254
Enabled: false
309255
Migration/DepartmentName:
310256
Enabled: false
257+
Naming/AccessorMethodName:
258+
Enabled: false
311259
Naming/BlockParameterName:
312260
Enabled: false
313261
Naming/HeredocDelimiterCase:
@@ -320,6 +268,20 @@ Naming/MethodParameterName:
320268
Enabled: false
321269
Naming/RescuedExceptionsVariableName:
322270
Enabled: false
271+
Naming/VariableNumber:
272+
Enabled: false
273+
Performance/BindCall:
274+
Enabled: false
275+
Performance/DeletePrefix:
276+
Enabled: false
277+
Performance/DeleteSuffix:
278+
Enabled: false
279+
Performance/InefficientHashSearch:
280+
Enabled: false
281+
Performance/UnfreezeString:
282+
Enabled: false
283+
Performance/UriDefaultParser:
284+
Enabled: false
323285
RSpec/Be:
324286
Enabled: false
325287
RSpec/Capybara/CurrentPathExpectation:
@@ -408,8 +370,6 @@ Style/AccessModifierDeclarations:
408370
Enabled: false
409371
Style/AccessorGrouping:
410372
Enabled: false
411-
Style/ArgumentsForwarding:
412-
Enabled: false
413373
Style/AsciiComments:
414374
Enabled: false
415375
Style/BisectedAttrAccessor:
@@ -418,8 +378,6 @@ Style/CaseLikeIf:
418378
Enabled: false
419379
Style/ClassEqualityComparison:
420380
Enabled: false
421-
Style/CollectionCompact:
422-
Enabled: false
423381
Style/ColonMethodDefinition:
424382
Enabled: false
425383
Style/CombinableLoops:
@@ -428,8 +386,6 @@ Style/CommentedKeyword:
428386
Enabled: false
429387
Style/Dir:
430388
Enabled: false
431-
Style/DocumentDynamicEvalDefinition:
432-
Enabled: false
433389
Style/DoubleCopDisableDirective:
434390
Enabled: false
435391
Style/EmptyBlockParameter:
@@ -468,12 +424,8 @@ Style/MixinUsage:
468424
Enabled: false
469425
Style/MultilineWhenThen:
470426
Enabled: false
471-
Style/NegatedIfElseCondition:
472-
Enabled: false
473427
Style/NegatedUnless:
474428
Enabled: false
475-
Style/NilLambda:
476-
Enabled: false
477429
Style/NumericPredicate:
478430
Enabled: false
479431
Style/OptionalBooleanParameter:
@@ -482,8 +434,6 @@ Style/OrAssignment:
482434
Enabled: false
483435
Style/RandomWithOffset:
484436
Enabled: false
485-
Style/RedundantArgument:
486-
Enabled: false
487437
Style/RedundantAssignment:
488438
Enabled: false
489439
Style/RedundantCondition:
@@ -516,8 +466,6 @@ Style/StringConcatenation:
516466
Enabled: false
517467
Style/Strip:
518468
Enabled: false
519-
Style/SwapValues:
520-
Enabled: false
521469
Style/SymbolProc:
522470
Enabled: false
523471
Style/TrailingBodyOnClass:
@@ -532,3 +480,35 @@ Style/TrailingMethodEndStatement:
532480
Enabled: false
533481
Style/UnpackFirst:
534482
Enabled: false
483+
Lint/DuplicateBranch:
484+
Enabled: false
485+
Lint/DuplicateRegexpCharacterClassElement:
486+
Enabled: false
487+
Lint/EmptyBlock:
488+
Enabled: false
489+
Lint/EmptyClass:
490+
Enabled: false
491+
Lint/NoReturnInBeginEndBlocks:
492+
Enabled: false
493+
Lint/ToEnumArguments:
494+
Enabled: false
495+
Lint/UnexpectedBlockArity:
496+
Enabled: false
497+
Lint/UnmodifiedReduceAccumulator:
498+
Enabled: false
499+
Performance/CollectionLiteralInLoop:
500+
Enabled: false
501+
Style/ArgumentsForwarding:
502+
Enabled: false
503+
Style/CollectionCompact:
504+
Enabled: false
505+
Style/DocumentDynamicEvalDefinition:
506+
Enabled: false
507+
Style/NegatedIfElseCondition:
508+
Enabled: false
509+
Style/NilLambda:
510+
Enabled: false
511+
Style/RedundantArgument:
512+
Enabled: false
513+
Style/SwapValues:
514+
Enabled: false

0 commit comments

Comments
 (0)