Skip to content
This repository was archived by the owner on May 11, 2022. It is now read-only.

Commit 7f0f7ae

Browse files
committed
FUSETOOLS2-1301 - migrate master to main branch
pin files used for test to latest tag instead of master branch. these tests are here to test with a random file accessed through http, not the latest content of it Signed-off-by: Aurélien Pupier <[email protected]>
1 parent ee88dbe commit 7f0f7ae

31 files changed

+68
-67
lines changed

.circleci/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ workflows:
6565
filters:
6666
branches:
6767
only:
68-
- master
68+
- main
6969
requires:
7070
- build

.github/workflows/macos-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Test on MacOS
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
build:

.github/workflows/windows-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Test on Windows
55

66
on:
77
push:
8-
branches: [ master ]
8+
branches: [ main ]
99
pull_request:
10-
branches: [ master ]
10+
branches: [ main ]
1111

1212
jobs:
1313
build:

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ All notable changes to the "vscode-didact" extension will be documented in this
143143

144144
## 0.1.7
145145

146-
- Uncluttering command palette and adding new doc for Didact-specific command Ids https://github.com/redhat-developer/vscode-didact/blob/master/examples/commands.reference.md
146+
- Uncluttering command palette and adding new doc for Didact-specific command Ids https://github.com/redhat-developer/vscode-didact/blob/main/examples/commands.reference.md
147147
- Adding new command for simply checking if CLI command executes with return code zero
148148
- Moved tutorial registry to back end setting location instead of preferences
149149

JenkinsFile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
node('rhel8'){
44
stage('Checkout repo') {
55
deleteDir()
6-
git url: 'https://github.com/redhat-developer/vscode-didact.git'
6+
git url: 'https://github.com/redhat-developer/vscode-didact.git',
7+
branch: 'main'
78
}
89

910
stage('Install requirements') {

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<p align="center">
2-
<img width="100" height="100" src="https://raw.githubusercontent.com/redhat-developer/vscode-didact/master/icon/logo.png">
2+
<img width="100" height="100" src="https://raw.githubusercontent.com/redhat-developer/vscode-didact/main/icon/logo.png">
33
</p><br/>
44

55
<h1 align="center">Didact</h1><br/>
66
<h2 align="center">Easy interactive tutorials for VS Code.</h2><br/>
77
<p align="justify">The <b>Didact</b> framework is designed to instruct users in a useful way regarding how to complete tasks through a combination of text (Markdown- or AsciiDoc-formatted), images, and active links that show VS Code functionality in action. Those links are paired with VS Code’s simple command framework to interact with the IDE directly -- and that provides one-click access to nearly all the functionality VS Code and its extensions have to offer.</p><br/>
88

99
<p align="center">
10-
<a href="https://github.com/redhat-developer/vscode-didact/tree/master"><img src="https://img.shields.io/github/tag/redhat-developer/vscode-didact.svg?style=plastic" alt="GitHub tag"/></a>
10+
<a href="https://github.com/redhat-developer/vscode-didact/tree/main"><img src="https://img.shields.io/github/tag/redhat-developer/vscode-didact.svg?style=plastic" alt="GitHub tag"/></a>
1111
<a href="https://circleci.com/gh/redhat-developer/vscode-didact"><img src="https://circleci.com/gh/redhat-developer/vscode-didact.svg?style=shield"></a>
1212
<img src="https://img.shields.io/badge/license-Apache%202-blue.svg" alt="License"/>
1313
<a href="https://gitter.im/redhat-developer/vscode-didact"><img src="https://img.shields.io/gitter/room/redhat-developer/home.js.sv" alt="Gitter"/></a>
14-
<a href="https://workspaces.openshift.com/f?url=https://github.com/redhat-developer/vscode-didact"><img src="https://raw.githubusercontent.com/redhat-developer/vscode-didact/master/icon/che-contribute.png" alt="Contribute"/></a>
14+
<a href="https://workspaces.openshift.com/f?url=https://github.com/redhat-developer/vscode-didact"><img src="https://raw.githubusercontent.com/redhat-developer/vscode-didact/main/icon/che-contribute.png" alt="Contribute"/></a>
1515

1616
</p><br/>
1717

@@ -60,7 +60,7 @@ If you run into issues migrating from an earlier version of Didact (0.3.x or ear
6060

6161
Check out [the project on Github](https://github.com/redhat-developer/vscode-didact)!
6262

63-
[The readme](https://github.com/redhat-developer/vscode-didact/blob/master/README.md) has a ton of information about some of the specifics for link formatting, project json format, etc.
63+
[The readme](https://github.com/redhat-developer/vscode-didact/blob/main/README.md) has a ton of information about some of the specifics for link formatting, project json format, etc.
6464

6565
And feel free to [add issues, submit feature requests, log bugs, etc](https://github.com/redhat-developer/vscode-didact/issues)!
6666

create_extension/create-new-tutorial-with-extension.didact.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Creating a new Didact tutorial and registering it with the Didact Tutorials view!
22

3-
Didact is an extension for VS Code that provides a simple Markdown-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the [VSCode Didact readme about link formatting for more information](https://github.com/redhat-developer/vscode-didact/blob/master/README.md)!
3+
Didact is an extension for VS Code that provides a simple Markdown-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the [VSCode Didact readme about link formatting for more information](https://github.com/redhat-developer/vscode-didact/blob/main/README.md)!
44

55
This Didact-based tutorial will walk you through the steps required to create a new VS Code extension that registers a new Didact tutorial.
66

create_extension/first-tutorial.didact.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thanks for creating your first Didact tutorial in AsciiDoc!
44

5-
Didact is an extension for VS Code that provides a simple Asciidoc-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the https://github.com/redhat-developer/vscode-didact/blob/master/README.md[VSCode Didact readme about link formatting for more information]!
5+
Didact is an extension for VS Code that provides a simple Asciidoc-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the https://github.com/redhat-developer/vscode-didact/blob/main/README.md[VSCode Didact readme about link formatting for more information]!
66

77
Constructing a Didact tutorial is as easy as writing an https://asciidoctor.org/docs/asciidoc-writers-guide/[AsciiDoc formatted document] and embedding some links that call specific VS Code commands.
88

@@ -35,4 +35,4 @@ Other things that Didact can do:
3535
== Further Information
3636

3737
* For more about AsciiDoc formatting, check out the https://asciidoctor.org/docs/asciidoc-syntax-quick-reference/[AsciiDoc Syntax Quick Reference]
38-
* For more about Didact, check out https://github.com/redhat-developer/vscode-didact/blob/master/README.md[the VSCode Didact readme]
38+
* For more about Didact, check out https://github.com/redhat-developer/vscode-didact/blob/main/README.md[the VSCode Didact readme]

create_extension/first-tutorial.didact.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Thanks for creating your first Didact tutorial in Markdown!
44

5-
Didact is an extension for VS Code that provides a simple Markdown-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the [VSCode Didact readme about link formatting for more information](https://github.com/redhat-developer/vscode-didact/blob/master/README.md)!
5+
Didact is an extension for VS Code that provides a simple Markdown-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the [VSCode Didact readme about link formatting for more information](https://github.com/redhat-developer/vscode-didact/blob/main/README.md)!
66

77
Constructing a Didact tutorial is as easy as writing a [Markdown formatted document](https://www.markdownguide.org/) and embedding some links that call specific VS Code commands.
88

@@ -32,9 +32,9 @@ Other things that Didact can do:
3232
* Gather all requirements from tutorial
3333
* Gather all commands from tutorial
3434

35-
For more about specific Didact commands, check out [the VSCode Didact Commands Reference](https://github.com/redhat-developer/vscode-didact/blob/master/examples/commands.reference.md)
35+
For more about specific Didact commands, check out [the VSCode Didact Commands Reference](https://github.com/redhat-developer/vscode-didact/blob/main/examples/commands.reference.md)
3636

3737
## Further Information
3838

3939
* For more about Markdown formatting, check out the [Markdown Guide](https://www.markdownguide.org/)
40-
* For more about Didact, check out [the VSCode Didact readme](https://github.com/redhat-developer/vscode-didact/blob/master/README.md)
40+
* For more about Didact, check out [the VSCode Didact readme](https://github.com/redhat-developer/vscode-didact/blob/main/README.md)

demos/asciidoc/didact-demo.didact.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ image:images/welcome-to-didact-header.png[Welcome to Didact,role="center"]
55

66
# Demonstrating Didact features
77

8-
Didact is an extension for VS Code that provides a simple Asciidoc-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the https://github.com/redhat-developer/vscode-didact/blob/master/README.md[VSCode Didact readme about link formatting for more information]!
8+
Didact is an extension for VS Code that provides a simple Asciidoc-based way to create tutorials that launch VS Code commands and walk users through performing particular tasks. See the https://github.com/redhat-developer/vscode-didact/blob/main/README.md[VSCode Didact readme about link formatting for more information]!
99

1010
## Functionality
1111

@@ -77,7 +77,7 @@ link:didact://?commandId=vscode.didact.scaffoldProject&srcFilePath=demo/projectw
7777
7878
### Linking to other Didact files
7979

80-
* link:vscode://redhat.vscode-didact?https=raw.githubusercontent.com/redhat-developer/vscode-didact/master/examples/requirements.example.didact.md[You can link to other Didact tutorials remotely - this one is on GitHub]
80+
* link:vscode://redhat.vscode-didact?https=raw.githubusercontent.com/redhat-developer/vscode-didact/main/examples/requirements.example.didact.md[You can link to other Didact tutorials remotely - this one is on GitHub]
8181
8282
* link:vscode://redhat.vscode-didact?extension=demos/markdown/helloJS/helloJS.didact.md[You can link to other Didact tutorials also included in the same extension]
8383
@@ -104,7 +104,7 @@ Asciidoc doesn't seem to support bringing in native HTML. But you can bring in t
104104

105105
Check out https://github.com/redhat-developer/vscode-didact[the project on Github]!
106106

107-
https://github.com/redhat-developer/vscode-didact/blob/master/README.md[The readme] has a ton of information about some of the specifics for link formatting, project json format, etc.
107+
https://github.com/redhat-developer/vscode-didact/blob/main/README.md[The readme] has a ton of information about some of the specifics for link formatting, project json format, etc.
108108

109109
And feel free to https://github.com/redhat-developer/vscode-didact/issues[add issues, submit feature requests, log bugs, etc]!
110110

0 commit comments

Comments
 (0)