Skip to content

Commit 2866e79

Browse files
lemmylemmy
committed
Replace "alygin.vscode-tlaplus" and "alygin.vscode-tlaplus-nightly"
with "tlaplus-lang.tlaplus-lang" on Marketplace. Part of Github issue #318 #318 [Build] Signed-off-by: Markus Alexander Kuppe <[email protected]>
1 parent d2e1743 commit 2866e79

15 files changed

+58
-199
lines changed

‎.github/workflows/nightly.sh

-23
This file was deleted.

‎.github/workflows/pre-release.yml

-53
This file was deleted.

‎.github/workflows/release-nightly.yml

-65
This file was deleted.

‎.github/workflows/release.yml

+33-25
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,47 @@
11
name: Release
22

3-
on: workflow_dispatch
3+
on:
4+
repository_dispatch:
5+
workflow_dispatch:
46

57
jobs:
8+
checksecret:
9+
name: check if VSCODE_MARKETPLACE_TLAPLUS_TOKEN is set in github secrets
10+
runs-on: ubuntu-latest
11+
outputs:
12+
is_MY_SECRET_set: ${{ steps.checksecret_job.outputs.is_MY_SECRET_set }}
13+
steps:
14+
- name: Check secret present
15+
id: checksecret_job
16+
env:
17+
MY_SECRET: ${{ secrets.VSCODE_MARKETPLACE_TLAPLUS_TOKEN }}
18+
run: |
19+
echo "is_MY_SECRET_set: ${{ env.MY_SECRET != '' }}"
20+
echo "::set-output name=is_MY_SECRET_set::${{ env.MY_SECRET != '' }}"
21+
622
build:
23+
## Do not run this action without the marketplace token present,
24+
## e.g., in a fork of this repo.
25+
needs: [checksecret]
26+
if: needs.checksecret.outputs.is_MY_SECRET_set == 'true'
727
runs-on: macOS-latest
828
steps:
929
- uses: actions/checkout@v1
1030
- uses: actions/setup-node@v1
1131
with:
1232
node-version: '18.19'
33+
- name: Get (latest) TLC
34+
run: wget https://nightly.tlapl.us/dist/tla2tools.jar -O tools/tla2tools.jar
35+
- name: Get (latest) CommunityModules
36+
run: wget https://github.com/tlaplus/CommunityModules/releases/latest/download/CommunityModules-deps.jar -O tools/CommunityModules-deps.jar
37+
- name: Prepare Release
38+
run: |
39+
## Create a git commit to use its date as the extension's version number below.
40+
git add tools/*.jar -f
41+
git commit -m "Latest CommunityModules and TLA+ tools"
1342
- name: Get current version
1443
id: version
15-
run: echo "::set-output name=version::$(jq -r .version package.json)"
44+
run: echo "::set-output name=version::$(git log -1 --format=%cd --date="format:%Y.%-m.%-d%H%M")"
1645
- name: Install dependencies
1746
run: |
1847
npm install
@@ -26,26 +55,5 @@ jobs:
2655
npm run lint
2756
npm test --silent
2857
- name: Publish to Marketplace
29-
run: vsce publish --pat "${{ secrets.VSCODE_MARKETPLACE_TOKEN }}"
30-
- name: Publish to Open VSX
31-
run: npx ovsx publish "vscode-tlaplus-${{ steps.version.outputs.version }}.vsix" -p "${{ secrets.OPEN_VSX_TOKEN }}"
32-
- name: Create Release
33-
id: create_release
34-
uses: actions/create-release@v1
35-
env:
36-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37-
with:
38-
tag_name: v${{ steps.version.outputs.version }}
39-
release_name: v${{ steps.version.outputs.version }}
40-
draft: false
41-
prerelease: false
42-
- name: Upload Release Asset
43-
id: upload-release-asset
44-
uses: actions/[email protected]
45-
env:
46-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
47-
with:
48-
upload_url: ${{ steps.create_release.outputs.upload_url }}
49-
asset_path: vscode-tlaplus-${{ steps.version.outputs.version }}.vsix
50-
asset_name: vscode-tlaplus-${{ steps.version.outputs.version }}.vsix
51-
asset_content_type: application/zip
58+
run: |
59+
vsce publish $(git log -1 --format=%cd --date="format:%Y.%-m.%-d%H%M") --pat "${{ secrets.VSCODE_MARKETPLACE_TLAPLUS_TOKEN }}"

‎CONTRIBUTING.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ For those, who want to write some code, here's a short guide.
1515
Clone the repository:
1616

1717
```
18-
git clone https://github.com/alygin/vscode-tlaplus.git
18+
git clone https://github.com/tlaplus/vscode-tlaplus.git
1919
cd vscode-tlaplus
2020
```
2121

@@ -158,7 +158,7 @@ The extension consists of the following components:
158158
3. The implementation of the Check Result View panel that visualizes TLC output and allows to analyze it easily.
159159
4. The `tla2tools.jar` file from the [official TLA+ project](https://github.com/tlaplus/tlaplus). All the specification syntax verifications, PlusCal translations and TLC checks are actually performed by this Java library.
160160

161-
The extension also requires a Java Virtual Machine (JVM) to be installed. [More information](https://github.com/alygin/vscode-tlaplus/wiki/Installing-Java).
161+
The extension also requires a Java Virtual Machine (JVM) to be installed. [More information](https://github.com/tlaplus/vscode-tlaplus/wiki/Installing-Java).
162162

163163
# Project Layout
164164

‎LICENSE

+2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
MIT License
22

33
Copyright (c) 2019 Andrew Lygin
4+
Copyright (c) 2020 TLA+ Foundation
5+
46

57
Permission is hereby granted, free of charge, to any person obtaining a copy
68
of this software and associated documentation files (the "Software"), to deal

‎README-nightly.md

-10
This file was deleted.

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# TLA<sup>+</sup> for Visual Studio Code
22

3-
[![Build Status](https://img.shields.io/github/actions/workflow/status/tlaplus/vscode-tlaplus/ci.yml?branch=master)](https://github.com/tlaplus/vscode-tlaplus/actions?query=workflow%3ACI) [![VS Code extension version](https://img.shields.io/visual-studio-marketplace/i/alygin.vscode-tlaplus?color=blue&label=Stable%20Release&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=alygin.vscode-tlaplus) [![VS Code extension version nightly](https://img.shields.io/visual-studio-marketplace/i/alygin.vscode-tlaplus-nightly?color=blue&label=Nightly%20Build&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=alygin.vscode-tlaplus-nightly)
3+
[![Build Status](https://img.shields.io/github/actions/workflow/status/tlaplus/vscode-tlaplus/ci.yml?branch=master)](https://github.com/tlaplus/vscode-tlaplus/actions?query=workflow%3ACI) [![VS Code extension version](https://img.shields.io/visual-studio-marketplace/i/tlaplus-lang?color=blue&label=Stable%20Release&style=flat-square)](https://marketplace.visualstudio.com/items?itemName=tlaplus-lang.tlaplus-lang)
44

55
This extension adds support for the [TLA<sup>+</sup> formal specification language](http://research.microsoft.com/en-us/um/people/lamport/tla/tla.html) to VS Code. It also supports running the TLC model checker on TLA<sup>+</sup> specifications.
66

@@ -40,10 +40,10 @@ If you decide to pitch in and write some code, this document will provide you wi
4040

4141
If you're not familiar with TLA<sup>+</sup>, but want to get a grasp on it, the following list of resources is a good starting point:
4242

43-
* [TLA<sup>+</sup> Home Page](http://research.microsoft.com/en-us/um/people/lamport/tla/tla.html) on Leslie Lamport's website.
43+
* [TLA<sup>+</sup> Home Page](http://www.tlapl.us) on Leslie Lamport's website.
44+
* [A collection of TLA<sup>+</sup> specification examples](https://github.com/tlaplus/Examples) in the TLA<sup>+</sup> repository.
4445
* [Introduction to TLA<sup>+</sup> and PlusCal](https://learntla.com) by Hillel Wayne.
4546
* [TLA<sup>+</sup> in Practice and Theory](https://pron.github.io/posts/tlaplus_part1) by Ron Pressler.
46-
* [A collection of TLA<sup>+</sup> specification examples](https://github.com/tlaplus/Examples) in the TLA<sup>+</sup> repository.
4747

4848
## License
4949

‎package-lock.json

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"name": "vscode-tlaplus",
3-
"displayName": "TLA+",
4-
"version": "1.6.0",
2+
"name": "tlaplus-lang",
3+
"displayName": "TLA+ (Temporal Logic of Actions)",
4+
"version": "1.7.0",
55
"description": "TLA+ language support",
6-
"publisher": "alygin",
6+
"publisher": "tlaplus-lang",
77
"license": "MIT",
88
"author": {
9-
"name": "Andrew Lygin"
9+
"name": "TLA+ Community"
1010
},
1111
"engines": {
1212
"vscode": "^1.82.0"
@@ -20,10 +20,10 @@
2020
],
2121
"repository": {
2222
"type": "git",
23-
"url": "https://github.com/alygin/vscode-tlaplus.git"
23+
"url": "https://github.com/tlaplus/vscode-tlaplus.git"
2424
},
2525
"bugs": {
26-
"url": "https://github.com/alygin/vscode-tlaplus/issues"
26+
"url": "https://github.com/tlaplus/vscode-tlaplus/issues"
2727
},
2828
"icon": "resources/images/tlaplus.png",
2929
"keywords": [
@@ -334,7 +334,7 @@
334334
"type": "string",
335335
"scope": "window",
336336
"default": "",
337-
"markdownDescription": "Java options to use when running TLA+ tools. [How it works.](https://github.com/alygin/vscode-tlaplus/wiki/Java-Options)",
337+
"markdownDescription": "Java options to use when running TLA+ tools. [How it works.](https://github.com/tlaplus/vscode-tlaplus/wiki/Java-Options)",
338338
"maxLength": 1000
339339
},
340340
"tlaplus.pluscal.options": {

‎src/commands/checkModel.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export async function checkModelCustom(
8585
return;
8686
}
8787
// Accept .tla files here because TLC configs and TLA+ modules can share the same file:
88-
// https://github.com/alygin/vscode-tlaplus/issues/220
88+
// https://github.com/tlaplus/vscode-tlaplus/issues/220
8989
const configFiles = await listFiles(path.dirname(doc.uri.fsPath),
9090
(fName) => fName.endsWith('.cfg') || fName.endsWith('.tla'));
9191
configFiles.sort();

‎src/debugger/debugging.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export async function checkAndDebugSpecCustom(
9494
return;
9595
}
9696
// Accept .tla files here because TLC configs and TLA+ modules can share the same file:
97-
// https://github.com/alygin/vscode-tlaplus/issues/220
97+
// https://github.com/tlaplus/vscode-tlaplus/issues/220
9898
const configFiles = await listFiles(path.dirname(targetResource.fsPath),
9999
(fName) => fName.endsWith('.cfg') || fName.endsWith('.tla'));
100100
configFiles.sort();

‎src/main.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import { ModuleSearchPathsTreeDataProvider } from './panels/moduleSearchPathsTre
3333

3434
const TLAPLUS_FILE_SELECTOR: vscode.DocumentSelector = { scheme: 'file', language: LANG_TLAPLUS };
3535
const TLAPLUS_CFG_FILE_SELECTOR: vscode.DocumentSelector = { scheme: 'file', language: LANG_TLAPLUS_CFG };
36-
const CHANGELOG_URL = vscode.Uri.parse('https://github.com/alygin/vscode-tlaplus/blob/master/CHANGELOG.md#change-log');
36+
const CHANGELOG_URL = vscode.Uri.parse('https://github.com/tlaplus/vscode-tlaplus/blob/master/CHANGELOG.md#change-log');
3737

3838
const tlaDocInfos = new TlaDocumentInfos();
3939

@@ -150,7 +150,7 @@ export function activate(context: vscode.ExtensionContext): void {
150150
// 393ee2b2443e270bacd9f11fa219c39a88fc987d/src/extension.ts#L63-L84
151151
// Also see wordPattern in tlaplus-lang-config.json that drops "@"
152152
// and "'" compared to VSCode's standard wordPattern.
153-
// https://github.com/alygin/vscode-tlaplus/issues/200
153+
// https://github.com/tlaplus/vscode-tlaplus/issues/200
154154
provideEvaluatableExpression(document: vscode.TextDocument, position: vscode.Position):
155155
vscode.ProviderResult<vscode.EvaluatableExpression> {
156156
const wordRange = document.getWordRangeAtPosition(position);

‎src/tla2tools.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { ToolOutputChannel } from './outputChannels';
1010
import { JavaVersionParser } from './parsers/javaVersion';
1111

1212
// CFG_EXTENSION can be used to fetch all the settings for this extension
13-
const CFG_EXTENSION = '@ext:alygin.vscode-tlaplus';
13+
const CFG_EXTENSION = '@ext:tlaplus-lang.tlaplus-lang';
1414

1515
const CFG_JAVA_HOME = 'tlaplus.java.home';
1616
const CFG_JAVA_OPTIONS = 'tlaplus.java.options';

‎tests/suite/parsers/tlc.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ suite('TLC Output Parser Test Suite', () => {
405405
});
406406

407407
test('Handles no-line-break message switch', () => {
408-
// https://github.com/alygin/vscode-tlaplus/issues/47
408+
// https://github.com/tlaplus/vscode-tlaplus/issues/47
409409
return assertOutput('no-line-break-switch.out', TEST_SPEC_FILES,
410410
new CheckResultBuilder('no-line-break-switch.out', CheckState.Success, CheckStatus.Finished)
411411
.addDColFilePath('/Users/bob/example.tla')

0 commit comments

Comments
 (0)