Skip to content

Commit 130e0d7

Browse files
authored
Fix - replace organization name to 'virtuslab' (#147)
1 parent 4a80f63 commit 130e0d7

File tree

10 files changed

+41
-43
lines changed

10 files changed

+41
-43
lines changed

.github/scripts/docker/DockerFile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
FROM gcr.io/distroless/base-debian10
22
ADD scala /usr/local/bin/scala
3-
LABEL org.opencontainers.image.source="https://github.com/virtuslabrnd/scala-cli"
43
ENTRYPOINT ["/usr/local/bin/scala"]

.github/scripts/scala-cli.rb.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# ScalaCli Formula
55
class ScalaCli < Formula
66
desc "Launcher for ScalaCli"
7-
homepage "https://virtuslabrnd.github.io/scala-cli/"
7+
homepage "https://virtuslab.github.io/scala-cli/"
88
url "@LAUNCHER_URL@"
99
version "@LAUNCHER_VERSION@"
1010
sha256 "@LAUNCHER_SHA256@"

.github/workflows/ci.yml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,13 @@ jobs:
107107
if: github.event_name == 'push'
108108
uses: docker/login-action@v1
109109
with:
110-
registry: ghcr.io
111-
username: ${{ github.actor }}
112-
password: ${{ secrets.GITHUB_TOKEN }}
110+
username: ${{ secrets.DOCKERHUB_USERNAME }}
111+
password: ${{ secrets.DOCKERHUB_TOKEN }}
113112
- name: Push scala-cli to github container registry
114113
if: github.event_name == 'push'
115114
run: |
116-
docker tag scala-cli ghcr.io/virtuslabrnd/scala-cli:latest
117-
docker push ghcr.io/virtuslabrnd/scala-cli:latest
115+
docker tag scala-cli virtuslab/scala-cli:latest
116+
docker push virtuslab/scala-cli:latest
118117
119118
native-static-tests:
120119
timeout-minutes: 80
@@ -197,7 +196,7 @@ jobs:
197196
vc-redist:
198197
timeout-minutes: 15
199198
runs-on: windows-2016
200-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'VirtuslabRnD/scala-cli'
199+
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'Virtuslab/scala-cli'
201200
steps:
202201
- uses: actions/checkout@v2
203202
with:
@@ -312,7 +311,7 @@ jobs:
312311
node-version: '12.x'
313312
- run: .github/scripts/update-website.sh
314313
env:
315-
GIT_USER: VirtuslabRnD
314+
GIT_USER: Virtuslab
316315
DEPLOYMENT_BRANCH: gh-pages
317316
GIT_PASS: ${{ secrets.GITHUB_TOKEN }}
318317

@@ -331,6 +330,6 @@ jobs:
331330
node-version: '12.x'
332331
- run: .github/scripts/update-website.sh
333332
env:
334-
GIT_USER: VirtuslabRnD
333+
GIT_USER: Virtuslab
335334
DEPLOYMENT_BRANCH: gh-pages
336335
GIT_PASS: ${{ secrets.GITHUB_TOKEN }}

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
# scala-cli
33

4-
[![Build status](https://github.com/VirtusLabRnD/scala-cli/workflows/CI/badge.svg)](https://github.com/VirtusLabRnD/scala-ci/actions?query=workflow%3ACI)
4+
[![Build status](https://github.com/VirtusLab/scala-cli/workflows/CI/badge.svg)](https://github.com/VirtusLab/scala-ci/actions?query=workflow%3ACI)
55
[![Maven Central](https://img.shields.io/maven-central/v/org.virtuslab.scala-cli/cli_2.12.svg)](https://maven-badges.herokuapp.com/maven-central/org.virtuslab.scala-cli/cli_2.12)
66

77
Scala CLI is an experimental tool to run/compile/test Scala that aims at being a better `scala` command. It shares some similarities with build tools, but doesn't aim at supporting multi-module projects, nor to be extended via a task system.

build.sc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -642,15 +642,15 @@ object ci extends Module {
642642
os.makeDir.all(targetDir)
643643

644644
val branch = "main"
645-
val repo = s"[email protected]:VirtuslabRnD/homebrew-scala-cli.git"
645+
val repo = s"[email protected]:Virtuslab/homebrew-scala-cli.git"
646646

647647
// Cloning
648648
gitClone(repo, branch, targetDir)
649649
setupGithubRepo(homebrewFormulaDir)
650650

651651
val launcherPath = os.Path("artifacts", os.pwd) / "scala-cli-x86_64-apple-darwin.gz"
652652
val launcherURL =
653-
s"https://github.com/VirtuslabRnD/scala-cli/releases/download/v$version/scala-cli-x86_64-apple-darwin.gz"
653+
s"https://github.com/Virtuslab/scala-cli/releases/download/v$version/scala-cli-x86_64-apple-darwin.gz"
654654

655655
val binarySha256 = os.proc("openssl", "dgst", "-sha256", "-binary")
656656
.call(
@@ -690,7 +690,7 @@ object ci extends Module {
690690
os.makeDir.all(targetDir)
691691

692692
val branch = "master"
693-
val repo = s"[email protected]:VirtuslabRnD/scala-cli-packages.git"
693+
val repo = s"[email protected]:Virtuslab/scala-cli-packages.git"
694694

695695
// Cloning
696696
gitClone(repo, branch, targetDir)
@@ -758,7 +758,7 @@ object ci extends Module {
758758
os.makeDir.all(targetDir)
759759

760760
val branch = "master"
761-
val repo = s"[email protected]:VirtuslabRnD/scala-cli-packages.git"
761+
val repo = s"[email protected]:Virtuslab/scala-cli-packages.git"
762762

763763
// Cloning
764764
gitClone(repo, branch, targetDir)

project/publish.sc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import mill._, scalalib._
66

77
import scala.concurrent.duration._
88

9-
def ghOrg = "VirtuslabRnD"
9+
def ghOrg = "Virtuslab"
1010
def ghName = "scala-cli"
1111

1212
trait ScalaCliPublishModule extends PublishModule with PublishLocalNoFluff {

website/docs/installation.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ import TabItem from '@theme/TabItem';
2525
<TabItem value="win">
2626
2727
Download Scala CLI for Windows
28-
<DownloadButton desc= 'Scala CLI for Windows' href='https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.msi'></DownloadButton>
28+
<DownloadButton desc= 'Scala CLI for Windows' href='https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.msi'></DownloadButton>
2929
</TabItem>
3030
<TabItem value="mac/linux">
3131

3232
Run the following one-line command in your terminal
3333

3434
```bash
35-
curl -sSf https://virtuslabrnd.github.io/scala-cli-packages/scala-setup.sh | sh
35+
curl -sSf https://virtuslab.github.io/scala-cli-packages/scala-setup.sh | sh
3636
```
3737
</TabItem>
3838
</Tabs>
@@ -67,7 +67,7 @@ values={[
6767
6868
Download the launcher from GitHub release assets with
6969
```bash
70-
curl -fL https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.gz | gzip -d > scala-cli
70+
curl -fL https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.gz | gzip -d > scala-cli
7171
chmod +x scala-cli
7272
sudo mv scala-cli /usr/local/bin/scala-cli
7373
```
@@ -83,8 +83,8 @@ scala-cli about
8383
Scala CLI can be installed via [apt](https://wiki.debian.org/Apt) packager tool.
8484

8585
```bash
86-
curl -s --compressed "https://virtuslabrnd.github.io/scala-cli-packages/KEY.gpg" | sudo apt-key add -
87-
sudo curl -s --compressed -o /etc/apt/sources.list.d/scala_cli_packages.list "https://virtuslabrnd.github.io/scala-cli-packages/debian/scala_cli_packages.list"
86+
curl -s --compressed "https://virtuslab.github.io/scala-cli-packages/KEY.gpg" | sudo apt-key add -
87+
sudo curl -s --compressed -o /etc/apt/sources.list.d/scala_cli_packages.list "https://virtuslab.github.io/scala-cli-packages/debian/scala_cli_packages.list"
8888
sudo apt update
8989
sudo apt install scala-cli
9090
```
@@ -99,12 +99,12 @@ snap install scala-cli
9999
</TabItem>
100100
<TabItem value="deb">
101101

102-
The Debian package can be downloaded at [this address](https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.deb).
102+
The Debian package can be downloaded at [this address](https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.deb).
103103

104104
Alternatively, you can download it and install it manually with:
105105

106106
```bash
107-
curl -fLo scala-cli.deb https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.deb
107+
curl -fLo scala-cli.deb https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.deb
108108
sudo dpkg -i scala-cli.deb
109109
```
110110
</TabItem>
@@ -117,22 +117,22 @@ Scala CLI can be installed via [yum](http://yum.baseurl.org) packager tool.
117117
sudo cat > /etc/yum.repos.d/virtuslab.repo << EOF
118118
[virtuslab-repo]
119119
name=VirtusLab Repo
120-
baseurl=https://virtuslabrnd.github.io/scala-cli-packages/CentOS/Packages
120+
baseurl=https://virtuslab.github.io/scala-cli-packages/CentOS/Packages
121121
enabled=1
122122
gpgcheck=1
123-
gpgkey=https://virtuslabrnd.github.io/scala-cli-packages/KEY.gpg
123+
gpgkey=https://virtuslab.github.io/scala-cli-packages/KEY.gpg
124124
EOF
125125
sudo yum repo-pkgs virtuslab-repo list
126126
sudo yum install scala-cli
127127
```
128128
</TabItem>
129129
<TabItem value="rpm">
130130

131-
The RPM package can be downloaded at [this address](https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.rpm).
131+
The RPM package can be downloaded at [this address](https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.rpm).
132132

133133
Alternatively, you can download it and install it manually with:
134134
```bash
135-
curl -fLo scala-cli.rpm https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.rpm
135+
curl -fLo scala-cli.rpm https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux.rpm
136136
sudo rpm -i scala-cli.rpm
137137
```
138138
</TabItem>
@@ -141,7 +141,7 @@ sudo rpm -i scala-cli.rpm
141141
Download the launcher from GitHub release assets with
142142

143143
```bash
144-
wget -q -O scala-cli.gz https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux-static.gz && gunzip scala-cli.gz
144+
wget -q -O scala-cli.gz https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-linux-static.gz && gunzip scala-cli.gz
145145
chmod +x scala-cli
146146
mv scala-cli /usr/bin/
147147
```
@@ -172,7 +172,7 @@ to be installed. See below for how to install it.
172172

173173
Download the launcher from GitHub release assets with
174174
```bash
175-
curl -fLo scala-cli.zip https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.zip
175+
curl -fLo scala-cli.zip https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.zip
176176
tar -xf scala-cli.zip
177177
```
178178

@@ -183,7 +183,7 @@ scala-cli about
183183

184184
If you get an error about `MSVCR100.dll` being missing, you have to install
185185
[Visual C++ redistributable](https://support.microsoft.com/en-us/topic/the-latest-supported-visual-c-downloads-2647da03-1eea-4433-9aff-95f26a218cc0). A valid version is distributed with the Scala CLI launchers.
186-
You can download it [here](https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/vc_redist.x64.exe),
186+
You can download it [here](https://github.com/Virtuslab/scala-cli/releases/download/nightly/vc_redist.x64.exe),
187187
and install it by double-clicking on it. Once the Visual C++ redistributable runtime is installed,
188188
check that the Scala CLI runs fine by running its `about` command:
189189
```bash
@@ -201,7 +201,7 @@ move scala-cli.exe "%USERPROFILE%/scala-cli"
201201
<TabItem value="installer">
202202

203203
Download MSI installer with Scala CLI for Windows
204-
<DownloadButton desc= 'Scala CLI for Windows' href='https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.msi'></DownloadButton>
204+
<DownloadButton desc= 'Scala CLI for Windows' href='https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-pc-win32.msi'></DownloadButton>
205205
</TabItem>
206206
</Tabs>
207207

@@ -221,7 +221,7 @@ values={[
221221
222222
Download the launcher from GitHub release assets with
223223
```bash
224-
curl -fL https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-apple-darwin.gz | gzip -d > scala-cli
224+
curl -fL https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-apple-darwin.gz | gzip -d > scala-cli
225225
chmod +x scala-cli
226226
mv scala-cli /usr/local/bin/scala-cli
227227
```
@@ -234,7 +234,7 @@ scala-cli about
234234
<TabItem value="installer">
235235

236236
Download PKG installer with Scala CLI for MacOS
237-
<DownloadButton desc= 'Scala CLI for MacOS' href='https://github.com/VirtuslabRnD/scala-cli/releases/download/nightly/scala-cli-x86_64-apple-darwin.pkg'></DownloadButton>
237+
<DownloadButton desc= 'Scala CLI for MacOS' href='https://github.com/Virtuslab/scala-cli/releases/download/nightly/scala-cli-x86_64-apple-darwin.pkg'></DownloadButton>
238238
<br/>
239239
<br/>
240240

@@ -245,7 +245,7 @@ Once downloaded, right-click on `scala-cli-x86_64-apple-darwin.pkg` from Finder,
245245
Scala CLI can be installed via [homebrew](https://brew.sh) with
246246

247247
```bash
248-
brew install VirtuslabRnD/scala-cli/scala-cli
248+
brew install Virtuslab/scala-cli/scala-cli
249249
```
250250
</TabItem>
251251
</Tabs>

website/docs/run.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ scala-cli run HelloScript.sc
8282
Scala applications can also be compiled and run using docker image with `scala-cli`.
8383

8484
```bash
85-
docker run ghcr.io/virtuslabrnd/scala-cli:latest about
85+
docker run virtuslab/scala-cli:latest about
8686
```
8787

8888
###
@@ -91,6 +91,6 @@ cat HelloWorld.scala
9191
# object HelloWorld extends App {
9292
# println("Hello world")
9393
# }
94-
docker run -v $(pwd)/HelloWorld.scala:/HelloWorld.scala ghcr.io/virtuslabrnd/scala-cli /HelloWorld.scala
94+
docker run -v $(pwd)/HelloWorld.scala:/HelloWorld.scala virtuslab/scala-cli /HelloWorld.scala
9595
# Hello world
9696
```

website/docusaurus.config.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ let isCI = process.env.CI || false;
55
module.exports = {
66
title: 'Scala CLI',
77
tagline: 'More featureful Scala Command-Line',
8-
url: 'https://virtuslabrnd.github.io',
8+
url: 'https://virtuslab.github.io',
99
onBrokenLinks: 'throw',
1010
onBrokenMarkdownLinks: 'warn',
1111
favicon: 'img/favicon.ico',
12-
organizationName: 'VirtuslabRnD',
12+
organizationName: 'Virtuslab',
1313
projectName: 'scala-cli',
1414
themeConfig: {
1515
navbar: {
@@ -26,7 +26,7 @@ module.exports = {
2626
label: 'Documentation',
2727
},
2828
{
29-
href: 'https://github.com/VirtuslabRnD/scala-cli',
29+
href: 'https://github.com/Virtuslab/scala-cli',
3030
label: 'GitHub',
3131
position: 'right',
3232
},
@@ -49,7 +49,7 @@ module.exports = {
4949
items: [
5050
{
5151
label: 'Gitter',
52-
href: 'https://gitter.im/VirtuslabRnD/scala-cli',
52+
href: 'https://gitter.im/Virtuslab/scala-cli',
5353
},
5454
],
5555
},
@@ -58,7 +58,7 @@ module.exports = {
5858
items: [
5959
{
6060
label: 'GitHub',
61-
href: 'https://github.com/VirtuslabRnD/scala-cli',
61+
href: 'https://github.com/Virtuslab/scala-cli',
6262
},
6363
],
6464
},
@@ -74,7 +74,7 @@ module.exports = {
7474
sidebarPath: require.resolve('./sidebars.js'),
7575
// Please change this to your repo.
7676
editUrl:
77-
'https://github.com/VirtuslabRnD/scala-cli/edit/master/website/',
77+
'https://github.com/Virtuslab/scala-cli/edit/master/website/',
7878
},
7979
theme: {
8080
customCss: require.resolve('./src/css/custom.css'),

website/src/pages/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ const Features = (props) => {
3535
<p>
3636
Our installation instructions are as simple as possible.
3737
</p>
38-
Just pick your <a href="https://github.com/VirtuslabRnD/scala-cli/releases/tag/nightly">distribution</a> and <a href="docs/installation">install</a> scala-cli.
38+
Just pick your <a href="https://github.com/Virtuslab/scala-cli/releases/tag/nightly">distribution</a> and <a href="docs/installation">install</a> scala-cli.
3939
<br/>
4040
No need to fluff with installing JVM or setting up PATH.
4141
</p>,

0 commit comments

Comments
 (0)