Skip to content

Commit

Permalink
Merge branch 'ballerina-platform:master' into byte-array-literal
Browse files Browse the repository at this point in the history
  • Loading branch information
ushirask authored Aug 10, 2023
2 parents 27f7dc0 + 4af6439 commit b1b162c
Show file tree
Hide file tree
Showing 894 changed files with 18,440 additions and 5,743 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Ensure all Java files use LF.
*.java eol=lf
2 changes: 1 addition & 1 deletion .github/workflows/automate_issue_labels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
Add-label:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Check for Type label inclusion
if: ${{ !(contains(join(github.event.issue.labels.*.name, ','), 'Type/')) }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/daily_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Initialize sub-modules
run: git submodule update --init
Expand All @@ -34,8 +34,8 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
version: '22.2.0'
java-version: '11'
java-version: '17.0.7'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
set-java-home: 'false'
Expand Down Expand Up @@ -65,15 +65,15 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/daily_spec_conformance_test_runner.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ jobs:
with:
ref: spec-conformance-test-runner

- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: "temurin"
java-version: "11"
java-version: "17"

- name: Initialize sub-modules
run: |
Expand Down
73 changes: 0 additions & 73 deletions .github/workflows/language_server_simulator.yml

This file was deleted.

10 changes: 5 additions & 5 deletions .github/workflows/nightly_publish_timestamped_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
ref: ${{ matrix.branch }}

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Initialize Sub Modules
run: git submodule update --init
Expand Down Expand Up @@ -61,6 +61,6 @@ jobs:
}"
- name: Generate Codecov Report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
files: ./.jacoco/reports/jacoco/report.xml
9 changes: 5 additions & 4 deletions .github/workflows/observe_package_push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout Tag
run: git checkout ${{ github.event.inputs.repoTag }}
- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Build with Gradle
env:
packageUser: ${{ github.actor }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/publish_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
- name: Set up JDK 11
uses: actions/setup-java@v2
uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'
- name: Set version env variable
run: |
echo "VERSION=$(./gradlew properties | grep ^version: | cut -d\ -f2 | sed 's@-SNAPSHOT@@')" >> $GITHUB_ENV
Expand Down
16 changes: 10 additions & 6 deletions .github/workflows/publish_timestamped_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,17 @@ jobs:
if: github.repository_owner == 'ballerina-platform'
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Checkout To Lang Branch
run: |
git checkout ${{ github.event.inputs.ballerina_lang_branch }}
- name: Initialize Sub Modules
run: git submodule update --init
Expand All @@ -40,11 +44,11 @@ jobs:
publishUser: ${{ secrets.BALLERINA_BOT_USERNAME }}
publishPAT: ${{ secrets.BALLERINA_BOT_TOKEN }}
run: |
./gradlew clean build -x createJavadoc --scan --continue --rerun-tasks
./gradlew clean build -x check -x test -x createJavadoc --scan --continue --rerun-tasks
./gradlew publish
./gradlew createCodeCoverageReport
- name: Generate Codecov Report
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
files: ./.jacoco/reports/jacoco/report.xml
39 changes: 28 additions & 11 deletions .github/workflows/pull_request_full_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17.0.7'

- name: Checkout To Lang Branch
run: |
Expand Down Expand Up @@ -55,6 +61,15 @@ jobs:
level: [ 1, 2, 3, 4, 5, 6, 7, 8, 9 ]

steps:
- name: Checkout Repository
uses: actions/checkout@v2

- name: Set up JDK 17
uses: actions/setup-java@v2
with:
distribution: 'temurin'
java-version: '17.0.7'

- name: Setup NodeJs
uses: actions/setup-node@v3
with:
Expand All @@ -76,15 +91,11 @@ jobs:
do git clone https://github.com/ballerina-platform/${module_name}.git; \
done
# - name: Checkout non-default branch
# run: |
# for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); \
# do
# cd $module_name
# git fetch origin
# git checkout -t origin/update4 || :
# cd ..
# done
# - name: Checkout non-default branch
# run: |
# for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
# cd $module_name && git fetch origin && git checkout -t origin/java_17_migration && cd ..; \
# done

- name: Update Lang Version in Module
run: |
Expand Down Expand Up @@ -116,10 +127,16 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
repository: 'ballerina-platform/ballerina-distribution'

- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '17.0.7'

- name: Download Ballerina Lang Artifacts
uses: actions/download-artifact@v2
with:
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/pull_request_ubuntu_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ jobs:
ubuntu_build:
name: Build with all tests on Ubuntu
runs-on: ubuntu-latest
timeout-minutes: 120
timeout-minutes: 150
concurrency:
group: ${{ github.head_ref }}-ubuntu
cancel-in-progress: true

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Initialize sub-modules
run: git submodule update --init
Expand All @@ -48,8 +48,8 @@ jobs:
- name: Setup GraalVM
uses: graalvm/setup-graalvm@v1
with:
version: '22.2.0'
java-version: '11'
java-version: '17.0.7'
distribution: 'graalvm'
components: 'native-image'
github-token: ${{ secrets.GITHUB_TOKEN }}
set-java-home: 'false'
Expand All @@ -70,7 +70,7 @@ jobs:

- name: Generate Codecov Report
if: github.event_name == 'pull_request'
uses: codecov/codecov-action@v1
uses: codecov/codecov-action@v3
with:
files: ./.jacoco/reports/jacoco/report.xml

Expand All @@ -84,15 +84,15 @@ jobs:

steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 11
uses: actions/setup-java@v2
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: '11'
java-version: '17.0.7'

- name: Initialize sub-modules
run: git submodule update --init
Expand Down
Loading

0 comments on commit b1b162c

Please sign in to comment.