Skip to content

Commit

Permalink
Merge pull request #464 from fatadel/ege-eclipse
Browse files Browse the repository at this point in the history
Eclipse Foundation Adaptation: fix tests failing
  • Loading branch information
egekorkan committed Apr 21, 2023
2 parents ad16c2b + 781d95c commit 3508918
Show file tree
Hide file tree
Showing 444 changed files with 39,058 additions and 35,787 deletions.
9 changes: 9 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
root = true

[{src,test}/**.{ts,json,js}]
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true
indent_style = space
indent_size = 4
34 changes: 34 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
# Set default behaviour, in case users don't have core.autocrlf set.
* text=auto

# Explicitly declare text files we want to always be normalized and converted
# to native line endings on checkout.

# Declare files that will always have LF line endings on checkout.
*.c text eol=lf
*.css text eol=lf
*.cpp text eol=lf
.editorconfig text eol=lf
.gitattributes text eol=lf
.gitignore text eol=lf
.gitmodules text eol=lf
*.gyp text eol=lf
*.h text eol=lf
*.hpp text eol=lf
*.js text eol=lf
*.ts text eol=lf
*.json text eol=lf
LICENSE text eol=lf
*.md text eol=lf
*.svg text eol=lf
*.sh text eol=lf

# Declare files that will always have CRLF line endings on checkout.
*.bat text eol=crlf
*.cmd text eol=crlf

# Denote all files that are truly binary and should not be modified.
*.gif binary
*.jpg binary
*.node binary
*.png binary
8 changes: 4 additions & 4 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

version: 2
updates:
- package-ecosystem: "" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
- package-ecosystem: "" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "daily"
16 changes: 16 additions & 0 deletions .github/scripts/deploy-web.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
#!/usr/bin/env bash
#
# Copyright (c) 2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
#
# This program and the accompanying materials are made available under the
# terms of the Eclipse Public License v. 2.0 which is available at
# http://www.eclipse.org/legal/epl-2.0, or the W3C Software Notice and
# Document License (2015-05-13) which is available at
# https://www.w3.org/Consortium/Legal/2015/copyright-software-and-document.
#
# SPDX-License-Identifier: EPL-2.0 OR W3C-20150513
#

TMP_PASS_FILE="$(mktemp)"
echo "$SSH_PASS" > $TMP_PASS_FILE
ssh -i $TMP_PASS_FILE -o StrictHostKeyChecking=no -o LogLevel=error $SSH_HOST "rm -r -f thingweb-playground; git clone https://github.com/thingweb/thingweb-playground.git; cd thingweb-playground; lerna bootstrap; cd ./packages/web; rm -r -f /var/www/html/playground/*; cp -L -r ./* /var/www/html/playground; echo cleaned and copy to webdir; echo CD DONE"
104 changes: 52 additions & 52 deletions .github/workflows/assertionscsv-update.yml
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
name: Daily Assertion Fetch
on:
schedule:
- cron: '00 00 * * *'
schedule:
- cron: "00 00 * * *"

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
# This workflow contains a single job to push the assertions
sync-assertioncsv:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '16'
- name: Install dependencies
run: lerna bootstrap --no-ci
- name: Fetch updated assertions.csv
run: |
cd ./packages/assertions
wget https://raw.githubusercontent.com/w3c/wot-thing-description/main/testing/assertions.csv --output-document=assertions-csv/assertions.csv
- name: Check for changes
continue-on-error: true
run: |
cd ./packages/assertions
git diff --exit-code assertions-csv/assertions.csv
echo "::set-output name=changed::$?"
id: diff
- name: Run generation scripts
if: ${{ ! steps.diff.outputs.changed }}
run: |
cd ./packages/assertions
bash generate-manual-csv.sh
- name: Add generated files and commit
if: ${{ ! steps.diff.outputs.changed }}
run: |
git config user.name 'Fady Salama'
git config user.email 'fadytawfik11@gmail.com'
git add -u
git commit -a -m "chore: sync assertions.csv with the current assertions in the spec and generate manual.csv"
- name: Create Pull Request
if: ${{ ! steps.diff.outputs.changed }}
id: cpr
uses: peter-evans/create-pull-request@v4
with:
branch: assertion-csv-sync
delete-branch: true
title: 'Update assertions.csv and generate manual.csv'
body: |
Update assertions.csv and generate manual.csv
- Updated with *today's* date
- Auto-generated by [create-pull-request][1]
[1]: https://github.com/peter-evans/create-pull-request
# This workflow contains a single job to push the assertions
sync-assertioncsv:
# The type of runner that the job will run on
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: "16"
- name: Install dependencies
run: lerna bootstrap --no-ci
- name: Fetch updated assertions.csv
run: |
cd ./packages/assertions
wget https://raw.githubusercontent.com/w3c/wot-thing-description/main/testing/assertions.csv --output-document=assertions-csv/assertions.csv
- name: Check for changes
continue-on-error: true
run: |
cd ./packages/assertions
git diff --exit-code assertions-csv/assertions.csv
echo "::set-output name=changed::$?"
id: diff
- name: Run generation scripts
if: ${{ ! steps.diff.outputs.changed }}
run: |
cd ./packages/assertions
bash generate-manual-csv.sh
- name: Add generated files and commit
if: ${{ ! steps.diff.outputs.changed }}
run: |
git config user.name 'Fady Salama'
git config user.email 'fadytawfik11@gmail.com'
git add -u
git commit -a -m "chore: sync assertions.csv with the current assertions in the spec and generate manual.csv"
- name: Create Pull Request
if: ${{ ! steps.diff.outputs.changed }}
id: cpr
uses: peter-evans/create-pull-request@v4
with:
branch: assertion-csv-sync
delete-branch: true
title: "Update assertions.csv and generate manual.csv"
body: |
Update assertions.csv and generate manual.csv
- Updated with *today's* date
- Auto-generated by [create-pull-request][1]
[1]: https://github.com/peter-evans/create-pull-request
106 changes: 52 additions & 54 deletions .github/workflows/ci-cd.yaml
Original file line number Diff line number Diff line change
@@ -1,66 +1,64 @@
name: Default CI & CD Pipeline

on:
push:
paths-ignore:
- '**.md'
- '**.png'
- '**.drawio'
- '**.xlsx'
pull_request:
paths-ignore:
- '**.md'
- '**.png'
- '**.drawio'
- '**.xlsx'
on:
push:
paths-ignore:
- "**.md"
- "**.png"
- "**.drawio"
- "**.xlsx"
pull_request:
paths-ignore:
- "**.md"
- "**.png"
- "**.drawio"
- "**.xlsx"
jobs:
setup-and-test:

runs-on: ubuntu-latest
setup-and-test:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x, 18.x]
strategy:
matrix:
node-version: [16.x, 18.x]

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

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

- name: Use lerna
run: npm install -g lerna

- name: Bootstrap
run: lerna bootstrap --no-ci

- name: Test
run: lerna run test --no-bail --stream
steps:
- name: Checkout
uses: actions/checkout@v2

- name: TD test
run: node packages/cli/index.js -i examples/td/*/*.jsonld

- name: TM test
run: node packages/cli/index.js -t TM -i examples/tm/*/*.jsonld
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}

deploy-via-ssh:
- name: Use lerna
run: npm install -g lerna

runs-on: ubuntu-latest
- name: Bootstrap
run: lerna bootstrap --no-ci

needs: setup-and-test
- name: Test
run: lerna run test --no-bail --stream

if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' && github.repository_owner == 'thingweb' }}
- name: TD test
run: node packages/cli/index.js -i examples/td/*/*.jsonld

steps:
- name: Checkout
uses: actions/checkout@v2
- name: TM test
run: node packages/cli/index.js -t TM -i examples/tm/*/*.jsonld

- name: Run remote commands script
run: ./.github/scripts/deploy-web.sh
shell: bash
env:
SSH_PASS: ${{ secrets.SSH_PASS }}
SSH_HOST: ${{ secrets.SSH_HOST }}
deploy-via-ssh:
runs-on: ubuntu-latest

needs: setup-and-test

if: ${{ github.ref == 'refs/heads/master' && github.event_name == 'push' && github.repository_owner == 'thingweb' }}

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

- name: Run remote commands script
run: ./.github/scripts/deploy-web.sh
shell: bash
env:
SSH_PASS: ${{ secrets.SSH_PASS }}
SSH_HOST: ${{ secrets.SSH_HOST }}

0 comments on commit 3508918

Please sign in to comment.