Skip to content

Commit 1784fda

Browse files
blackwinterblackwinter
committed
2 parents 9073421 + b254549 commit 1784fda

File tree

1,336 files changed

+646072
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,336 files changed

+646072
-27
lines changed

‎.editorconfig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,12 @@ trim_trailing_whitespace = true
2828
end_of_line = crlf
2929
trim_trailing_whitespace = false
3030

31-
[*.{g,gradle,json,xml,xsd,yml}]
31+
[*.{fix,g,gradle,json,md,mwe2,sh,vim,xml,xsd,xtext,yml}]
3232
indent_size = 2
3333

34+
[*.tmLanguage]
35+
indent_style = tab
36+
3437
[metafacture-io/src/test/resources/org/metafacture/io/compressed.txt]
3538
insert_final_newline = false
3639

‎.github/workflows/build.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build
22

33
on: push
4+
45
jobs:
56
build:
67
runs-on: ubuntu-latest
@@ -10,5 +11,12 @@ jobs:
1011
uses: actions/setup-java@v1
1112
with:
1213
java-version: 11
13-
- name: Build with gradle
14+
- name: Build with Gradle
1415
run: ./gradlew check
16+
env:
17+
METAFIX_LOG_PASSED: true
18+
- name: Install language server
19+
run: ./gradlew installServer
20+
- name: Install fix extension
21+
working-directory: metafix-vsc/
22+
run: npm install

‎.github/workflows/deploy.yml

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
2+
name: Build and Deploy
3+
4+
on:
5+
push:
6+
branches:
7+
- deploy
8+
9+
jobs:
10+
build-and-deploy:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Set up Node.js
15+
uses: actions/setup-node@v2
16+
- name: Set up vsce
17+
run: npm install -g vsce
18+
- name: Set up JDK 11
19+
uses: actions/setup-java@v1
20+
with:
21+
java-version: 11
22+
- name: Build with Gradle
23+
run: |
24+
chmod +x gradlew
25+
./gradlew build
26+
./gradlew installServer
27+
- name: Create fix extension
28+
working-directory: metafix-vsc/
29+
run: |
30+
npm install
31+
vsce package -o fix.vsix
32+
- name: Pushes vsix to GitHub Pages
33+
uses: dmnemec/copy_file_to_another_repo_action@v1.0.4
34+
env:
35+
API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
36+
with:
37+
source_file: 'metafix-vsc/fix.vsix'
38+
destination_repo: 'metafacture/metafacture.github.io'
39+
destination_branch: main
40+
destination_folder: 'ide-extensions'
41+
user_email: '${{ github.actor }}@users.noreply.github.com'
42+
user_name: '${{ github.actor }}'

‎.gitignore

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
target/
1919

2020
# Ignore temporary gradle files:
21-
.gradle
21+
.gradle/
2222
.gradletasknamecache
23-
build
23+
build/
2424

2525
# Ignore tmp directory
2626
tmp
@@ -53,3 +53,17 @@ buildbot.keyring
5353
# Ignore files with sensitive data
5454
gradle.properties
5555
secring.gpg
56+
57+
# Ignore metafacture-fix files
58+
*.jfr
59+
*.vsix
60+
generated/
61+
node_modules/
62+
package-lock.json
63+
xtext-gen/
64+
xtext-server/
65+
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.diff
66+
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.err
67+
/metafix/src/test/resources/org/metafacture/metafix/integration/**/*.out
68+
/metafix/src/test/resources/org/metafacture/metafix/integration/**/output-*
69+
!/metafix/src/test/resources/org/metafacture/metafix/integration/**/expected.err

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ As a general rule, we don't change public commit history, i.e. we don’t use ``
105105

106106
#### Code Formatting and Quality
107107

108-
Please format your code according to [this EditorConfig file](https://github.com/metafacture/metafacture-fix/blob/master/.editorconfig) and consider our current [code quality and style guidelines](https://github.com/metafacture/metafacture-core/wiki/Code-Quality-and-Style).
108+
Please format your code according to [this EditorConfig file](https://github.com/metafacture/metafacture-core/blob/master/.editorconfig) and consider our current [code quality and style guidelines](https://github.com/metafacture/metafacture-core/wiki/Code-Quality-and-Style).
109109

110-
The [metafacture-fix build](https://github.com/metafacture/metafacture-fix/blob/master/build.gradle) performs automated [EditorConfig](https://github.com/metafacture/metafacture-fix/blob/master/.editorconfig) and [Checkstyle](https://github.com/metafacture/metafacture-fix/blob/master/config/checkstyle/checkstyle.xml) checks.
110+
The [metafacture-core build](https://github.com/metafacture/metafacture-core/blob/master/build.gradle) performs automated [EditorConfig](https://github.com/metafacture/metafacture-core/blob/master/.editorconfig) and [Checkstyle](https://github.com/metafacture/metafacture-core/blob/master/config/checkstyle/checkstyle.xml) checks.
111111

112112
The code is automatically [quality-checked on sonarcloud.io](https://sonarcloud.io/dashboard?id=org.metafacture%3Ametafacture-core) when pushed to GitHub.
113113

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Apache License
1+
Apache License
22
Version 2.0, January 2004
33
http://www.apache.org/licenses/
44

0 commit comments

Comments
 (0)