Skip to content

Commit 9386a50

Browse files
committed
remove Consul start from workflows
1 parent 7842dca commit 9386a50

10 files changed

+111
-151
lines changed

.github/actions/consul-start/action.yml

Lines changed: 0 additions & 13 deletions
This file was deleted.

.github/workflows/swift-benchmark-delta.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,10 @@ jobs:
2727
if: ${{ runner.os == 'Linux' }}
2828
run: |
2929
sudo apt-get install -y libjemalloc-dev
30-
- name: Start consul
31-
uses: ./.github/actions/consul-start
3230
- name: Git URL token override and misc
3331
run: |
34-
#git config --global url."https://ordo-ci:${{ secrets.CI_MACHINE_PAT }}@github.com".insteadOf "https://github.com"
35-
#/usr/bin/ordo-performance
3632
[ -d Benchmarks ] && echo "hasBenchmark=1" >> $GITHUB_ENV
3733
[ -f Benchmarks/Package.swift ] && echo "BENCHMARK_PACKAGE_PATH=--package-path Benchmarks" >> $GITHUB_ENV
38-
echo "BENCHMARK_RUN_URL=https://github.com/ordo-one/${{ github.event.repository.name }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
3934
echo "/opt/homebrew/bin:/usr/local/bin" >> $GITHUB_PATH
4035
- name: Run benchmarks for PR branch
4136
if: ${{ env.hasBenchmark == '1' }}

.github/workflows/swift-code-coverage.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches: [ main ]
77
pull_request:
8-
branches: [ main, next ]
8+
branches: [ main ]
99
jobs:
1010
test-code-coverage:
1111
runs-on: [ubuntu-22.04]
@@ -23,9 +23,6 @@ jobs:
2323
- name: Swift version
2424
run: swift --version
2525

26-
- name: Start consul
27-
uses: ./.github/actions/consul-start
28-
2926
- name: Run tests
3027
continue-on-error: true
3128
run: |

.github/workflows/swift-linux-build.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches: [ main ]
77
pull_request:
8-
branches: [ main, next ]
8+
branches: [ main ]
99

1010
jobs:
1111
build-linux:
@@ -24,10 +24,7 @@ jobs:
2424
with:
2525
swift-version: ${{ matrix.swift }}
2626

27-
- uses: actions/checkout@v4
28-
29-
- name: Start consul
30-
uses: ./.github/actions/consul-start
27+
- uses: actions/checkout@v4
3128

3229
- name: Ubuntu deps
3330
if: ${{ runner.os == 'Linux' }}
@@ -42,6 +39,4 @@ jobs:
4239

4340
- name: Run tests
4441
run: |
45-
if [ -d Tests ]; then
46-
swift test --parallel
47-
fi
42+
[ -d Tests ] && swift test --parallel

.github/workflows/swift-macos-build.yml

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ on:
55
push:
66
branches: [ main ]
77
pull_request:
8-
branches: [ main, next ]
9-
8+
branches: [ main ]
9+
1010
jobs:
1111
build-macos:
1212
timeout-minutes: 60
@@ -17,8 +17,6 @@ jobs:
1717
# swift: [ "5.10", "6.0" ]
1818

1919
runs-on: ${{ matrix.os }}
20-
# env:
21-
# DEVELOPER_DIR: /Applications/Xcode_16.1.app/Contents/Developer
2220

2321
steps:
2422
- uses: swift-actions/setup-swift@v2
@@ -35,24 +33,21 @@ jobs:
3533
3634
- uses: actions/checkout@v4
3735

38-
- name: Start consul
39-
uses: ./.github/actions/consul-start
40-
4136
- name: GH auth
4237
run: |
4338
echo "machine api.github.com login ${{ secrets.GITHUB_TOKEN }} password x-oauth-basic" > $HOME/.netrc
4439
cat ~/.netrc
40+
4541
- name: Swift version
4642
run: swift --version
43+
4744
- name: Build
4845
run: swift build
46+
4947
- name: Run tests
5048
run: |
51-
if [ -d Tests ]; then
52-
swift test --parallel
53-
fi
49+
[ -d Tests ] && swift test --parallel
50+
5451
- name: Run tests (release)
5552
run: |
56-
if [ -d Tests ]; then
57-
swift test -c release --parallel
58-
fi
53+
[ -d Tests ] && swift test -c release --parallel

.github/workflows/swift-sanitizer-address.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches: [ main ]
77
pull_request:
8-
branches: [ main, next ]
8+
branches: [ main ]
99

1010
jobs:
1111
address-sanitizer:
@@ -31,9 +31,6 @@ jobs:
3131
3232
- uses: actions/checkout@v4
3333

34-
- name: Start consul
35-
uses: ./.github/actions/consul-start
36-
3734
- name: Swift version
3835
run: swift --version
3936

@@ -43,9 +40,9 @@ jobs:
4340

4441
- name: Run address sanitizer
4542
run: swift test --sanitize=address
46-
43+
4744
- name: Clean before release build sanitizier
4845
run: swift package clean
49-
46+
5047
- name: Run address sanitizer on release build
5148
run: swift test --sanitize=address -c release -Xswiftc -enable-testing

.github/workflows/swift-sanitizer-thread.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
push:
66
branches: [ main ]
77
pull_request:
8-
branches: [ main, next ]
8+
branches: [ main ]
99

1010
jobs:
1111
thread-sanitizer:
@@ -32,9 +32,6 @@ jobs:
3232
3333
- uses: actions/checkout@v4
3434

35-
- name: Start consul
36-
uses: ./.github/actions/consul-start
37-
3835
- name: Swift version
3936
run: swift --version
4037

@@ -44,9 +41,9 @@ jobs:
4441

4542
- name: Run thread sanitizer
4643
run: swift test --sanitize=thread
47-
44+
4845
- name: Clean before release build sanitizier
4946
run: swift package clean
50-
47+
5148
- name: Run thread sanitizer on release build
5249
run: swift test --sanitize=thread -c release -Xswiftc -enable-testing

.swiftlint.yml

Lines changed: 93 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,93 @@
1-
child_config: .swiftlint_refinement.yml
2-
parent_config: .swiftlint_base.yml
1+
####################################################################
2+
# DO NOT EDIT THIS FILE
3+
# This is a master file maintained in https://github.com/ordo-one/public-repository-templates
4+
#
5+
# Add overrides into `swiftlint_refinement.yml` in the directory it self or
6+
# .swiftlint.yml under the specific directory where the code is located
7+
#
8+
# Documentation is under https://github.com/realm/SwiftLint
9+
####################################################################
10+
11+
included:
12+
- Benchmarks
13+
- Sources
14+
- Tests
15+
excluded:
16+
analyzer_rules:
17+
- unused_import
18+
opt_in_rules:
19+
- array_init
20+
- attributes
21+
- closure_end_indentation
22+
- closure_spacing
23+
- collection_alignment
24+
- contains_over_filter_count
25+
- contains_over_filter_is_empty
26+
- contains_over_first_not_nil
27+
- contains_over_range_nil_comparison
28+
- discouraged_none_name
29+
- discouraged_object_literal
30+
- empty_collection_literal
31+
- empty_count
32+
- empty_string
33+
- empty_xctest_method
34+
- enum_case_associated_values_count
35+
- explicit_init
36+
- extension_access_modifier
37+
- fallthrough
38+
- fatal_error_message
39+
- file_name
40+
- first_where
41+
- flatmap_over_map_reduce
42+
- identical_operands
43+
- joined_default_parameter
44+
- last_where
45+
- legacy_multiple
46+
- literal_expression_end_indentation
47+
- lower_acl_than_parent
48+
- modifier_order
49+
- nimble_operator
50+
- nslocalizedstring_key
51+
- number_separator
52+
- object_literal
53+
- operator_usage_whitespace
54+
- overridden_super_call
55+
- override_in_extension
56+
- pattern_matching_keywords
57+
- prefer_self_in_static_references
58+
- prefer_self_type_over_type_of_self
59+
- private_action
60+
- private_outlet
61+
- prohibited_interface_builder
62+
- prohibited_super_call
63+
- quick_discouraged_call
64+
- quick_discouraged_focused_test
65+
- quick_discouraged_pending_test
66+
- reduce_into
67+
- redundant_nil_coalescing
68+
- redundant_type_annotation
69+
- single_test_class
70+
- sorted_first_last
71+
- sorted_imports
72+
- static_operator
73+
- strong_iboutlet
74+
- test_case_accessibility
75+
- toggle_bool
76+
- unavailable_function
77+
- unneeded_parentheses_in_closure_argument
78+
- unowned_variable_capture
79+
- untyped_error_in_catch
80+
- vertical_parameter_alignment_on_call
81+
- vertical_whitespace_closing_braces
82+
- vertical_whitespace_opening_braces
83+
- xct_specific_matcher
84+
- yoda_condition
85+
line_length:
86+
warning: 140
87+
error: 140
88+
ignores_comments: true
89+
ignores_urls: true
90+
ignores_function_declarations: true
91+
ignores_interpolated_strings: true
92+
identifier_name:
93+
excluded: [id, i, j, k]

.swiftlint_base.yml

Lines changed: 0 additions & 93 deletions
This file was deleted.

.swiftlint_refinement.yml

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)