This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil-vscode.git
The following commit(s) were added to refs/heads/main by this push:
new e30c0cf Address CI issues - Add scala built/test/package - #89 - Add
yarn package - #84 - Converge CI Files = #62
e30c0cf is described below
commit e30c0cf3acff9f83f3ff541bd4185825662f5e16
Author: Michael Hoke <[email protected]>
AuthorDate: Fri May 6 11:58:59 2022 -0400
Address CI issues
- Add scala built/test/package - #89
- Add yarn package - #84
- Converge CI Files = #62
Address review comments
Add name to rat-check job
Address review comments
Closes #62
Closes #84
Closes #89
---
.github/workflows/CI.yml | 112 +++++++++++++++++++++++++++++++++++++++
.github/workflows/formatting.yml | 54 -------------------
.github/workflows/one-commit.yml | 43 ---------------
.github/workflows/rat-check.yml | 48 -----------------
.github/workflows/tests.yml | 39 --------------
README.md | 4 +-
6 files changed, 113 insertions(+), 187 deletions(-)
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
new file mode 100644
index 0000000..ad5f7d7
--- /dev/null
+++ b/.github/workflows/CI.yml
@@ -0,0 +1,112 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+---
+name: CI
+on:
+ push:
+ branches-ignore: [ 'dependabot/**' ]
+ pull_request:
+ types: [opened, synchronize, reopened]
+
+jobs:
+ single-commit:
+ name: Single Commit Pull Request
+ if: github.event_name == 'pull_request'
+ runs-on: ubuntu-20.04
+ steps:
+ - name: Check Single Commit
+ uses: actions/[email protected]
+ with:
+ script: |
+ const commits = await github.rest.pulls.listCommits({
+ ...context.repo,
+ pull_number: context.issue.number,
+ });
+ core.info("Number of commits in this pull request: " +
commits.data.length);
+ if (commits.data.length > 1) {
+ core.setFailed("If approved with two +1's, squash this pull
request into one commit");
+ }
+
+ code-format:
+ name: TypeScript/Scala Formatting
+ runs-on: ubuntu-20.04
+ defaults:
+ run:
+ shell: bash
+ env:
+ SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++2.12.15
+
+ steps:
+ - uses: actions/[email protected]
+ - name: Setup Node
+ uses: actions/[email protected]
+ with:
+ node-version: '16'
+ - name: Setup Java
+ uses: actions/[email protected]
+ with:
+ distribution: temurin
+ java-version: 11
+ - run: $SBT scalafmtCheck
+ - run: $SBT scalafmtSbtCheck
+ - run: yarn install
+ - run: yarn lint
+
+ rat-check:
+ name: Rat Check
+ runs-on: ubuntu-20.04
+ defaults:
+ run:
+ shell: bash
+ env:
+ SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++2.12.15
+
+ steps:
+ - name: Setup Java
+ uses: actions/[email protected]
+ with:
+ distribution: temurin
+ java-version: 11
+
+ - name: Check out Repository
+ uses: actions/[email protected]
+ with:
+ fetch-depth: 0
+
+ - name: Run Rat Check
+ run: $SBT ratCheck || (cat target/rat.txt; exit 1)
+
+ build-test-package:
+ name: Build, Test, and Package
+ strategy:
+ matrix:
+ os: [macos-11, ubuntu-20.04, windows-2019]
+ node: [ '14', '16' ]
+ runs-on: ${{ matrix.os }}
+ defaults:
+ run:
+ shell: bash
+ env:
+ SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++2.12.15
+ steps:
+ - uses: actions/[email protected]
+ - name: Install Node.js
+ uses: actions/[email protected]
+ with:
+ node-version: ${{ matrix.node}}
+ - run: yarn build
+ - run: yarn test
+ - run: $SBT test
diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml
deleted file mode 100644
index b7eab34..0000000
--- a/.github/workflows/formatting.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-name: Code Formatting
-on:
- push:
- branches-ignore: [ 'dependabot/**' ]
- pull_request:
- types: [opened, synchronize, reopened]
-
-jobs:
- ts-format:
- name: TypeScript Formatting
- runs-on: ubuntu-20.04
- steps:
- - uses: actions/[email protected]
- - name: Setup Node
- uses: actions/[email protected]
- with:
- node-version: '16'
- - run: yarn install
- - run: yarn lint
-
- scala-format:
- name: Scala Formatting
- runs-on: ubuntu-20.04
- defaults:
- run:
- shell: bash
- env:
- SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++2.12.13
-
- steps:
- - uses: actions/[email protected]
- - name: Setup Java
- uses: actions/[email protected]
- with:
- distribution: temurin
- java-version: 11
- - run: $SBT scalafmtCheck
- - run: $SBT scalafmtSbtCheck
diff --git a/.github/workflows/one-commit.yml b/.github/workflows/one-commit.yml
deleted file mode 100644
index 21d180a..0000000
--- a/.github/workflows/one-commit.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-name: Single Commit PR
-
-on:
- push:
- branches-ignore: [ 'dependabot/**' ]
- pull_request:
- types: [opened, synchronize, reopened]
-
-
-jobs:
- single-commit:
- name: Single Commit Pull Request
- if: github.event_name == 'pull_request'
- runs-on: ubuntu-20.04
- steps:
- - name: Check Single Commit
- uses: actions/[email protected]
- with:
- script: |
- const commits = await github.rest.pulls.listCommits({
- ...context.repo,
- pull_number: context.issue.number,
- });
- core.info("Number of commits in this pull request: " +
commits.data.length);
- if (commits.data.length > 1) {
- core.setFailed("If approved with two +1's, squash this pull
request into one commit");
- }
diff --git a/.github/workflows/rat-check.yml b/.github/workflows/rat-check.yml
deleted file mode 100644
index ebf5e55..0000000
--- a/.github/workflows/rat-check.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-name: Rat Check
-
-on:
- push:
- branches-ignore: [ 'dependabot/**' ]
- pull_request:
- types: [opened, synchronize, reopened]
-
-jobs:
- check:
- name: Rat Check
- runs-on: ubuntu-20.04
- defaults:
- run:
- shell: bash
- env:
- SBT: sbt -J-Xms1024m -J-Xmx5120m -J-XX:ReservedCodeCacheSize=512m
-J-XX:MaxMetaspaceSize=1024m ++2.12.13
-
- steps:
- - name: Setup Java
- uses: actions/[email protected]
- with:
- distribution: temurin
- java-version: 11
-
- - name: Check out Repository
- uses: actions/[email protected]
- with:
- fetch-depth: 0
-
- - name: Run Rat Check
- run: $SBT ratCheck || (cat target/rat.txt; exit 1)
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
deleted file mode 100644
index 13b0b6a..0000000
--- a/.github/workflows/tests.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
----
-name: Unit Tests
-on:
- push:
- branches-ignore: [ 'dependabot/**' ]
- pull_request:
- types: [opened, synchronize, reopened]
-
-jobs:
- build:
- name: Unit Tests
- strategy:
- matrix:
- os: [macos-11, ubuntu-20.04, windows-2019]
- node: [ '10', '12', '14', '16' ]
- runs-on: ${{ matrix.os }}
- steps:
- - uses: actions/[email protected]
- - name: Install Node.js
- uses: actions/[email protected]
- with:
- node-version: ${{ matrix.node}}
- - run: npm install
- - run: npm test
diff --git a/README.md b/README.md
index 501a1da..d77cf52 100644
--- a/README.md
+++ b/README.md
@@ -22,9 +22,7 @@
# Apache Daffodil VS Code Extension
-[](https://github.com/apache/daffodil-vscode/actions/workflows/tests.yml)
-[](https://github.com/apache/daffodil-vscode/actions/workflows/formatting.yml)
-[](https://github.com/apache/daffodil-vscode/actions/workflows/rat-check.yml)
+[](https://github.com/apache/daffodil-vscode/actions/workflows/CI.yml)
</div>
