Skip to content

Commit 66fee27

Browse files
authored
Merge pull request #3078 from vdice/chore/spinframework-url-updates
chore(*): more spinframework org/url updates
2 parents 701088c + 55b87ac commit 66fee27

File tree

26 files changed

+67
-67
lines changed

26 files changed

+67
-67
lines changed

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ license = { workspace = true }
77

88
[workspace.package]
99
version = "3.3.0-pre0"
10-
authors = ["Fermyon Engineering <[email protected]>"]
10+
authors = ["Spin Framework Contributors"]
1111
edition = "2021"
1212
license = "Apache-2.0 WITH LLVM-exception"
13-
homepage = "https://developer.fermyon.com/spin"
14-
repository = "https://github.com/fermyon/spin"
13+
homepage = "https://spinframework.dev"
14+
repository = "https://github.com/spinframework/spin"
1515
rust-version = "1.81"
1616

1717
[dependencies]

GOVERNANCE.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ This document describes the governance of the Spin project.
55
The Spin project consists of several codebases with different release cycles. These codebases include:
66

77
- Core Spin:
8-
- [Spin](https://github.com/fermyon/spin)
8+
- [Spin](https://github.com/spinframework/spin)
99
- SDKs:
10-
- [Spin Python SDK](https://github.com/fermyon/spin-python-sdk)
11-
- [Spin JavaScript SDK](https://github.com/fermyon/spin-js-sdk)
12-
- [Spin Rust SDK](https://github.com/fermyon/spin-rust-sdk)
13-
- [Spin .NET SDK](https://github.com/fermyon/spin-dotnet-sdk)
14-
- [Spin Go SDK](https://github.com/fermyon/spin-go-sdk)
10+
- [Spin Python SDK](https://github.com/spinframework/spin-python-sdk)
11+
- [Spin JavaScript SDK](https://github.com/spinframework/spin-js-sdk)
12+
- [Spin Rust SDK](https://github.com/spinframework/spin-rust-sdk)
13+
- [Spin .NET SDK](https://github.com/spinframework/spin-dotnet-sdk)
14+
- [Spin Go SDK](https://github.com/spinframework/spin-go-sdk)
1515
- Plugins:
16-
- [Spin Plugins Index Repository](https://github.com/fermyon/spin-plugins)
16+
- [Spin Plugins Index Repository](https://github.com/spinframework/spin-plugins)
1717
- [Fermyon Platform Plugin](https://github.com/fermyon/platform-plugin)
18-
- [Spin Test Plugin](https://github.com/fermyon/spin-test)
18+
- [Spin Test Plugin](https://github.com/spinframework/spin-test)
1919
- Triggers:
20-
- [Spin Command Trigger](https://github.com/fermyon/spin-trigger-command)
21-
- [Spin SQS Trigger](https://github.com/fermyon/spin-trigger-sqs)
22-
- [Spin Cron Trigger](https://github.com/fermyon/spin-trigger-cron)
20+
- [Spin Command Trigger](https://github.com/spinframework/spin-trigger-command)
21+
- [Spin SQS Trigger](https://github.com/spinframework/spin-trigger-sqs)
22+
- [Spin Cron Trigger](https://github.com/spinframework/spin-trigger-cron)
2323
- Other
24-
- [Spin Fileserver](https://github.com/fermyon/spin-fileserver)
24+
- [Spin Fileserver](https://github.com/spinframework/spin-fileserver)
2525

2626
Each repository is subject to the same overall governance model, but has different teams of people (“maintainers”) with permissions and access to the repository. This is meant to increase diversity of maintainers in the Spin project and also increases the velocity of code changes. Major changes and features to the project including additions to the repository list above are to be proposed through the [Spin Improvement Proposal](docs/content/sips/index.md) process.
2727

@@ -39,11 +39,11 @@ Changes to project maintainers use the following:
3939
- Project maintainers MUST remain active on the project. If they are unresponsive for > 3 months, they will lose project maintainer-ship, unless the remaining project maintainers of the given project and the Spin Governance Committee agree to extend the period to be greater than 3 months.
4040
- New maintainers MUST be nominated by existing maintainers. Maintainers are to discuss and agree in a private setting adding a new maintainer. Once a decision has been made, a maintainer may be added to the project via a pull request to the relevant MAINTAINERS.md file.
4141
- A maintainer may be removed for a [code of conduct](CODE_OF_CONDUCT.md) violation by the Spin Governance Committee. Code of conduct violations may be submitted to any member(s) on the Spin Governance Committee by email. See email information on MAINTAINERS.md.
42-
- When a project has no active maintainers, the maintainers of the [fermyon/spin Github repo](https://github.com/fermyon/spin) become responsible for it, and may archive the project, or find new maintainers.
42+
- When a project has no active maintainers, the maintainers of the [spinframework/spin Github repo](https://github.com/spinframework/spin) become responsible for it, and may archive the project, or find new maintainers.
4343

4444
## Spin Governance Committee
4545

46-
The project maintainers for [github.com/fermyon/spin](http://github.com/fermyon/spin) also serve as the Spin Governance Committee and have the following additional responsibilities:
46+
The project maintainers for [github.com/spinframework/spin](https://github.com/spinframework/spin) also serve as the Spin Governance Committee and have the following additional responsibilities:
4747

4848
- Maintaining the mission, vision, values, and scope of the project
4949
- Refining this governance document

ROADMAP.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Taking these considerations into account and feedback from the community, the Sp
66

77
1. Composition and polyglot development experience
88

9-
WebAssembly components unlock a new opportunity as it relates to the polyglot development experience. In Spin, we seek to enable the polyglot re-use of components, allowing developers to specify how to use components written in various languages as libraries to fulfill dependencies in their Spin components as specified in the [Component Dependencies SIP](https://github.com/fermyon/spin/pull/2543). We’ll use this as the foundational work to then iterate on the polyglot development experience.
9+
WebAssembly components unlock a new opportunity as it relates to the polyglot development experience. In Spin, we seek to enable the polyglot re-use of components, allowing developers to specify how to use components written in various languages as libraries to fulfill dependencies in their Spin components as specified in the [Component Dependencies SIP](https://github.com/spinframework/spin/pull/2543). We’ll use this as the foundational work to then iterate on the polyglot development experience.
1010

1111
2. Building a composable runtime
1212

13-
There are currently some assumptions baked into the Spin runtime about the functionality provided by underlying host environments, however it’s likely a host environment may offer a subset of the capabilities assumed in the Spin runtime today or an entirely custom set of capabilities. Modularizing the Spin runtime allows it to be more readily extendable and customizable based on host environment. This requires breaking changes and a major code refactor, so this work will also be the basis for a Spin 3.0 release. See the [Spin Factors SIP](https://github.com/fermyon/spin/pull/2518) for an overview.
13+
There are currently some assumptions baked into the Spin runtime about the functionality provided by underlying host environments, however it’s likely a host environment may offer a subset of the capabilities assumed in the Spin runtime today or an entirely custom set of capabilities. Modularizing the Spin runtime allows it to be more readily extendable and customizable based on host environment. This requires breaking changes and a major code refactor, so this work will also be the basis for a Spin 3.0 release. See the [Spin Factors SIP](https://github.com/spinframework/spin/pull/2518) for an overview.
1414

1515
3. Spin application development experience improvements
1616

17-
It has become increasingly clear that there is interest in scenarios where Spin is used as a developer tool to build applications that target runtimes other than the Spin runtime (example: [NGINX Unit](https://unit.nginx.org/news/2024/fermyon-spin-rust-sdk/)). Right now, there are implicit assumptions made about the target environment both by the Spin CLI and the Spin SDKs. To support these scenarios, there will need to be work done around modularizing SDKs and building tooling that validates a Spin application can be run with a specific target environment. Foundational work for these efforts is described in the [Spin Build Target Check SIP](https://github.com/fermyon/spin/pull/2556) and is an ongoing effort.
17+
It has become increasingly clear that there is interest in scenarios where Spin is used as a developer tool to build applications that target runtimes other than the Spin runtime (example: [NGINX Unit](https://unit.nginx.org/news/2024/fermyon-spin-rust-sdk/)). Right now, there are implicit assumptions made about the target environment both by the Spin CLI and the Spin SDKs. To support these scenarios, there will need to be work done around modularizing SDKs and building tooling that validates a Spin application can be run with a specific target environment. Foundational work for these efforts is described in the [Spin Build Target Check SIP](https://github.com/spinframework/spin/pull/2556) and is an ongoing effort.

crates/componentize/src/bugs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ impl std::fmt::Display for WasiLibc377Bug {
4545
f,
4646
"This Wasm module appears to have been compiled with wasi-sdk version <19 \
4747
which contains a critical memory safety bug. For more information, see: \
48-
https://github.com/fermyon/spin/issues/2552"
48+
https://github.com/spinframework/spin/issues/2552"
4949
)
5050
}
5151
}

crates/core/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ impl Default for Config {
7878
inner.epoch_interruption(true);
7979
inner.wasm_component_model(true);
8080
// If targeting musl, disable native unwind to address this issue:
81-
// https://github.com/fermyon/spin/issues/2889
81+
// https://github.com/spinframework/spin/issues/2889
8282
// TODO: remove this when wasmtime is updated to >= v27.0.0
8383
#[cfg(all(target_os = "linux", target_env = "musl"))]
8484
inner.native_unwind_info(false);

crates/plugins/src/lookup.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const PLUGINS_REPO_LOCAL_DIRECTORY: &str = ".spin-plugins";
1313
// Name of directory containing the installed manifests
1414
pub(crate) const PLUGINS_REPO_MANIFESTS_DIRECTORY: &str = "manifests";
1515

16-
pub(crate) const SPIN_PLUGINS_REPO: &str = "https://github.com/fermyon/spin-plugins/";
16+
pub(crate) const SPIN_PLUGINS_REPO: &str = "https://github.com/spinframework/spin-plugins/";
1717

1818
/// Looks up plugin manifests in centralized spin plugin repository.
1919
pub struct PluginLookup {

crates/plugins/src/manifest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::PluginStore;
99

1010
/// Expected schema of a plugin manifest. Should match the latest Spin plugin
1111
/// manifest JSON schema:
12-
/// <https://github.com/fermyon/spin-plugins/tree/main/json-schema>
12+
/// <https://github.com/spinframework/spin-plugins/tree/main/json-schema>
1313
#[derive(Serialize, Debug, Deserialize, PartialEq)]
1414
#[serde(rename_all = "camelCase")]
1515
pub struct PluginManifest {

crates/trigger-http/src/spin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl HttpExecutor for SpinHttpExecutor {
6161

6262
// Preparing to remove the params field. We are leaving it in place for now
6363
// to avoid breaking the ABI, but no longer pass or accept values in it.
64-
// https://github.com/fermyon/spin/issues/663
64+
// https://github.com/spinframework/spin/issues/663
6565
let params = vec![];
6666

6767
let uri = match parts.uri.path_and_query() {

cross/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM ghcr.io/cross-rs/aarch64-unknown-linux-musl@sha256:7ad32efcae37c178fed63da301ff982d2430f15fc7d39e6c0b28124e14fac394
22

3-
## as per analysis done in https://github.com/fermyon/spin/pull/2287#issuecomment-1970145410 we need
3+
## as per analysis done in https://github.com/spinframework/spin/pull/2287#issuecomment-1970145410 we need
44
## to disable the cmake config in cross-rs. Setting CROSS_SYSROOT=/ seems to have done the trick
55

66
ENV CROSS_SYSROOT=/

cross/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ These intrinsics are missing for `aarch64` in `gcc < 10.3`, while `cross-rs` shi
55

66
The code in this folder does a feature check and patches the `arm_neon.h` header with polyfills if the functions are missing.
77

8-
See https://github.com/fermyon/spin/issues/1786 for the upstream issue.
8+
See https://github.com/spinframework/spin/issues/1786 for the upstream issue.

deploy/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The production version of the website is deployed whenever commits are pushed to
1010

1111
## Manual Deploys
1212

13-
Deployments may also be [triggered manually](https://github.com/fermyon/spin/actions/workflows/deploy-website.yml), providing a choice of `ref` and `sha`.
13+
Deployments may also be [triggered manually](https://github.com/spinframework/spin/actions/workflows/deploy-website.yml), providing a choice of `ref` and `sha`.
1414

1515
## Nomad jobs
1616

deploy/spin-docs.nomad

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ job "spin-docs" {
7575
}
7676

7777
artifact {
78-
source = "https://github.com/fermyon/spin/releases/download/v2.0.1/spin-v2.0.1-linux-amd64.tar.gz"
78+
source = "https://github.com/spinframework/spin/releases/download/v2.0.1/spin-v2.0.1-linux-amd64.tar.gz"
7979
options {
8080
checksum = "sha256:686bb12b9244ed33bf54a53e62303879036632b476ad09a728172b260f26c8e7"
8181
}

docs/content/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ title = "Introducing Spin"
22
template = "main"
33
date = "2022-03-14T00:22:56Z"
44
[extra]
5-
url = "https://github.com/fermyon/spin/blob/main/docs/content/index.md"
5+
url = "https://github.com/spinframework/spin/blob/main/docs/content/index.md"
66

77
---
88

9-
The documentation on this site has been moved to [The Fermyon Developer Home](https://developer.fermyon.com).
9+
The documentation on this site has been moved to [spinframework.dev](https://spinframework.dev).

docs/content/release-process.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Ensure that CI/CD is green for this commit, specifically the [Build](https://git
5555
5656
1. Once the version bump PR is approved and merged, confirm that CI is green for that merge commit.
5757

58-
1. Create a new tag from the merge commit. The tag should begin with a `v`, followed by the version number, e.g. `v2.0.0`. Then, push the tag to the `fermyon/spin` origin repo.
58+
1. Create a new tag from the merge commit. The tag should begin with a `v`, followed by the version number, e.g. `v2.0.0`. Then, push the tag to the `spinframework/spin` origin repo.
5959

6060
As an example, via the `git` CLI:
6161

@@ -67,7 +67,7 @@ Ensure that CI/CD is green for this commit, specifically the [Build](https://git
6767
# Create a GPG-signed and annotated tag
6868
git tag -s -m "Spin v2.0.0" v2.0.0
6969
70-
# Push the tag to the remote corresponding to fermyon/spin (here 'origin')
70+
# Push the tag to the remote corresponding to spinframework/spin (here 'origin')
7171
git push origin v2.0.0
7272
```
7373

docs/spin.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -195,31 +195,31 @@ environment = { DESTINATION = "https://spinframework.dev/template-authoring" }
195195

196196
[component.redirect-sips-index]
197197
source = "modules/redirect.wasm"
198-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/index.md" }
198+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/index.md" }
199199

200200
[component.redirect-sip001]
201201
source = "modules/redirect.wasm"
202-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/001-spin-deploy.md" }
202+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/001-spin-deploy.md" }
203203

204204
[component.redirect-sip002]
205205
source = "modules/redirect.wasm"
206-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/002-app-config.md" }
206+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/002-app-config.md" }
207207

208208
[component.redirect-sip003]
209209
source = "modules/redirect.wasm"
210-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/003-trigger-executors.md" }
210+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/003-trigger-executors.md" }
211211

212212
[component.redirect-sip004]
213213
source = "modules/redirect.wasm"
214-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/004-spin-build.md" }
214+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/004-spin-build.md" }
215215

216216
[component.redirect-sip005]
217217
source = "modules/redirect.wasm"
218-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/005-manifest-redesign.md" }
218+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/005-manifest-redesign.md" }
219219

220220
[component.redirect-sip006]
221221
source = "modules/redirect.wasm"
222-
environment = { DESTINATION = "https://github.com/fermyon/spin/blob/main/docs/content/sips/006-spin-plugins.md" }
222+
environment = { DESTINATION = "https://github.com/spinframework/spin/blob/main/docs/content/sips/006-spin-plugins.md" }
223223

224224
[component.redirect-contributing]
225225
source = "modules/redirect.wasm"

examples/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ languages, plus an example of writing [a custom Spin trigger](./spin-timer).
66
You can also find many more examples in the SDK repositories for various
77
languages, including:
88

9-
- [Rust](https://github.com/fermyon/spin-rust-sdk/tree/stable/examples)
10-
- [Go](https://github.com/fermyon/spin-go-sdk/tree/stable/examples)
11-
- [Python](https://github.com/fermyon/spin-python-sdk/tree/stable/examples)
12-
- [JavaScript and TypeScript](https://github.com/fermyon/spin-js-sdk/tree/stable/examples)
13-
- [.NET](https://github.com/fermyon/spin-dotnet-sdk/tree/stable/samples)
9+
- [Rust](https://github.com/spinframework/spin-rust-sdk/tree/stable/examples)
10+
- [Go](https://github.com/spinframework/spin-go-sdk/tree/stable/examples)
11+
- [Python](https://github.com/spinframework/spin-python-sdk/tree/stable/examples)
12+
- [JavaScript and TypeScript](https://github.com/spinframework/spin-js-sdk/tree/stable/examples)
13+
- [.NET](https://github.com/spinframework/spin-dotnet-sdk/tree/stable/samples)

examples/http-cpp/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ trigger](https://spin.fermyon.dev/http-trigger) implemented in C++.
55

66
### Building and Running
77

8-
First install [Rust](https://rustup.rs) and [Spin](https://github.com/fermyon/spin).
8+
First install [Rust](https://rustup.rs) and [Spin](https://github.com/spinframework/spin).
99

1010
Next, grab the latest [WASI SDK](https://github.com/WebAssembly/wasi-sdk)
1111
release and place it at /opt/wasi-sdk on your filesystem. For Linux, this would

src/commands/templates.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const UPGRADE_ONLY: &str = "GIT_URL";
2020

2121
const DEFAULT_TEMPLATES_INSTALL_PROMPT: &str =
2222
"You don't have any templates yet. Would you like to install the default set?";
23-
const DEFAULT_TEMPLATE_REPO: &str = "https://github.com/fermyon/spin";
23+
const DEFAULT_TEMPLATE_REPO: &str = "https://github.com/spinframework/spin";
2424

2525
/// Commands for working with WebAssembly component templates.
2626
#[derive(Subcommand, Debug)]
@@ -274,10 +274,10 @@ impl Upgrade {
274274
let has_unorigined_default_templates = no_origin.iter().any(|t| t.id() == "http-rust");
275275
let has_unorigined_js_templates = no_origin.iter().any(|t| t.id() == "http-js");
276276
if has_unorigined_default_templates {
277-
repos.insert("https://github.com/fermyon/spin");
277+
repos.insert("https://github.com/spinframework/spin");
278278
}
279279
if has_unorigined_js_templates {
280-
repos.insert("https://github.com/fermyon/spin-js-sdk");
280+
repos.insert("https://github.com/spinframework/spin-js-sdk");
281281
}
282282

283283
let mut sources = vec![];
@@ -654,16 +654,16 @@ mod tests {
654654
#[test]
655655
fn infers_github_url_if_needed() {
656656
assert_eq!(
657-
"https://github.com/fermyon/spin",
658-
infer_github("fermyon/spin")
657+
"https://github.com/spinframework/spin",
658+
infer_github("spinframework/spin")
659659
);
660660
assert_eq!(
661-
"https://github.com/fermyon/spin",
662-
infer_github("/fermyon/spin")
661+
"https://github.com/spinframework/spin",
662+
infer_github("/spinframework/spin")
663663
);
664664
assert_eq!(
665-
"https://github.com/fermyon/spin",
666-
infer_github("https://github.com/fermyon/spin")
665+
"https://github.com/spinframework/spin",
666+
infer_github("https://github.com/spinframework/spin")
667667
);
668668
}
669669
}

templates/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bump-go-versions:
1717
bump-rust-versions:
1818
for dir in $$(ls -d *-rust) ; do \
1919
cd $$dir/content ; \
20-
sed -r -i.sed-bak -e 's%(spin-sdk = )(("[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?")|(\{ git = "https://github.com/fermyon/spin", branch = "main" \}))%spin-sdk = "${CRATES_IO_VERSION}"%g' Cargo.toml.tmpl ; \
20+
sed -r -i.sed-bak -e 's%(spin-sdk = )(("[0-9]+.[0-9]+.[0-9]+(-rc.[0-9]+)?")|(\{ git = "https://github.com/spinframework/spin", branch = "main" \}))%spin-sdk = "${CRATES_IO_VERSION}"%g' Cargo.toml.tmpl ; \
2121
rm *.sed-bak ; \
2222
cd - 2>&1 >/dev/null ; \
2323
done

0 commit comments

Comments
 (0)