Skip to content

Commit 59018c7

Browse files
committed
Merge branch 'main' into roger/fix-require-relative
# Conflicts: # .github/workflows/kotlin-tests.yml # .github/workflows/swift-tests.yml # .ruby-version # Gemfile.lock
2 parents adda3c5 + c567a3c commit 59018c7

File tree

6 files changed

+14
-27
lines changed

6 files changed

+14
-27
lines changed

.github/workflows/kotlin-tests.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Kotlin Tests
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
37
jobs:
48
test:
59
runs-on: ubuntu-latest # Assuming Kotlin projects can be built on Linux
@@ -21,7 +25,6 @@ jobs:
2125
${{ runner.os }}-gradle-
2226
- uses: ruby/setup-ruby@v1
2327
with:
24-
ruby-version: '3.3'
2528
bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
2629
- name: Generate Kotlin Code & Run Tests
2730
run: bundle exec rake test_kotlin

.github/workflows/pull-request.yml

-18
This file was deleted.

.github/workflows/push.yml .github/workflows/run-tests.yml

+2-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ on:
33
push:
44
branches:
55
- main
6+
pull_request:
67
jobs:
78
test:
8-
env:
9-
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
109
strategy:
1110
fail-fast: false
1211
matrix:
@@ -20,5 +19,5 @@ jobs:
2019
with:
2120
ruby-version: ${{ matrix.ruby }}
2221
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
23-
- name: Run tests
22+
- name: Run tests and linter
2423
run: bundle exec rake

.github/workflows/swift-tests.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
name: Swift Tests
2-
on: [push, pull_request]
2+
on:
3+
push:
4+
branches:
5+
- main
6+
pull_request:
37
jobs:
48
test:
59
runs-on: macos-latest
@@ -8,7 +12,6 @@ jobs:
812
- uses: actions/checkout@v2
913
- uses: ruby/setup-ruby@v1
1014
with:
11-
ruby-version: '3.3'
1215
bundler-cache: true # Runs 'bundle install' and caches installed gems automatically
1316
- name: Generate Swift Code & Run Tests
1417
run: bundle exec rake test_swift

.ruby-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.3.1
1+
3.3.3

Gemfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ GEM
8080
yaml (0.3.0)
8181

8282
PLATFORMS
83+
arm64-darwin-23
8384
ruby
8485
x86_64-darwin-19
8586
x86_64-linux
86-
arm64-darwin-23
8787

8888
DEPENDENCIES
8989
arkana!

0 commit comments

Comments
 (0)