Skip to content

Commit

Permalink
ci: migration from Artifactory to Nexus
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremylvln committed Sep 1, 2024
1 parent 9870f8d commit 03ea312
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
env:
ORG_GRADLE_PROJECT_signing.gnupg.keyName: "${{ steps.gpg-signing-key.outputs.keyid }}"
ORG_GRADLE_PROJECT_signing.gnupg.passphrase: "${{ secrets.GPG_PASSPHRASE }}"
ARTIFACTORY_USERNAME: "${{ secrets.ARTIFACTORY_USERNAME }}"
ARTIFACTORY_PASSWORD: "${{ secrets.ARTIFACTORY_PASSWORD }}"
NEXUS_USERNAME: "${{ secrets.NEXUS_USERNAME }}"
NEXUS_PASSWORD: "${{ secrets.NEXUS_PASSWORD }}"

release:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -132,8 +132,8 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
ORG_GRADLE_PROJECT_signing.gnupg.keyName: "${{ steps.gpg-signing-key.outputs.keyid }}"
ORG_GRADLE_PROJECT_signing.gnupg.passphrase: "${{ secrets.GPG_PASSPHRASE }}"
ARTIFACTORY_USERNAME: "${{ secrets.ARTIFACTORY_USERNAME }}"
ARTIFACTORY_PASSWORD: "${{ secrets.ARTIFACTORY_PASSWORD }}"
NEXUS_USERNAME: "${{ secrets.NEXUS_USERNAME }}"
NEXUS_PASSWORD: "${{ secrets.NEXUS_PASSWORD }}"

- name: Package Helm chart
working-directory: kube/helm
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@ subprojects {

url =
if ((version as String).endsWith("-SNAPSHOT")) {
uri("https://maven.jeremylvln.fr/artifactory/shulker-snapshots")
uri("https://maven.jeremylvln.fr/repository/shulker-snapshots")
} else {
uri("https://maven.jeremylvln.fr/artifactory/shulker-releases")
uri("https://maven.jeremylvln.fr/repository/shulker-releases")
}

credentials {
username = findProperty("artifactory.username")?.toString() ?: System.getenv("ARTIFACTORY_USERNAME")
password = findProperty("artifactory.password")?.toString() ?: System.getenv("ARTIFACTORY_PASSWORD")
username = findProperty("nexus.username")?.toString() ?: System.getenv("NEXUS_USERNAME")
password = findProperty("nexus.password")?.toString() ?: System.getenv("NEXUS_PASSWORD")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/shulker-operator/src/constants.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#[cfg(any(test, debug_assertions))]
pub const SHULKER_PLUGIN_REPOSITORY: &str =
"https://maven.jeremylvln.fr/artifactory/shulker-snapshots";
"https://maven.jeremylvln.fr/repository/shulker-snapshots";
#[cfg(not(debug_assertions))]
pub const SHULKER_PLUGIN_REPOSITORY: &str =
"https://maven.jeremylvln.fr/artifactory/shulker-releases";
"https://maven.jeremylvln.fr/repository/shulker-releases";

#[cfg(test)]
pub const SHULKER_PLUGIN_VERSION: &str = "0.0.0-test-cfg";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ mod tests {
.unwrap();
assert_eq!(
plugins_env.value.as_ref().unwrap(),
"https://maven.jeremylvln.fr/artifactory/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
"https://maven.jeremylvln.fr/repository/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ spec:
- name: SHULKER_SERVER_WORLD_URL
value: "https://example.com/my_world.tar.gz"
- name: SHULKER_SERVER_PLUGIN_URLS
value: "https://maven.jeremylvln.fr/artifactory/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
value: "https://maven.jeremylvln.fr/repository/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
- name: SHULKER_SERVER_PATCH_URLS
value: "https://example.com/my_patch.tar.gz"
image: "alpine:latest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ spec:
- name: SHULKER_SERVER_WORLD_URL
value: "https://example.com/my_world.tar.gz"
- name: SHULKER_SERVER_PLUGIN_URLS
value: "https://maven.jeremylvln.fr/artifactory/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
value: "https://maven.jeremylvln.fr/repository/shulker-snapshots/io/shulkermc/shulker-server-agent/0.0.0-test-cfg/shulker-server-agent-0.0.0-test-cfg-paper.jar;https://example.com/my_plugin.jar"
- name: SHULKER_SERVER_PATCH_URLS
value: "https://example.com/my_patch.tar.gz"
image: "alpine:latest"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1125,7 +1125,7 @@ mod tests {
.unwrap();
assert_eq!(
plugins_env.value.as_ref().unwrap(),
"https://maven.jeremylvln.fr/artifactory/shulker-snapshots/io/shulkermc/shulker-proxy-agent/0.0.0-test-cfg/shulker-proxy-agent-0.0.0-test-cfg-velocity.jar;https://example.com/my_plugin.jar"
"https://maven.jeremylvln.fr/repository/shulker-snapshots/io/shulkermc/shulker-proxy-agent/0.0.0-test-cfg/shulker-proxy-agent-0.0.0-test-cfg-velocity.jar;https://example.com/my_plugin.jar"
);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ spec:
- name: SHULKER_VERSION_CHANNEL
value: Velocity
- name: SHULKER_PROXY_PLUGIN_URLS
value: "https://maven.jeremylvln.fr/artifactory/shulker-snapshots/io/shulkermc/shulker-proxy-agent/0.0.0-test-cfg/shulker-proxy-agent-0.0.0-test-cfg-velocity.jar;https://example.com/my_plugin.jar"
value: "https://maven.jeremylvln.fr/repository/shulker-snapshots/io/shulkermc/shulker-proxy-agent/0.0.0-test-cfg/shulker-proxy-agent-0.0.0-test-cfg-velocity.jar;https://example.com/my_plugin.jar"
- name: SHULKER_PROXY_PATCH_URLS
value: "https://example.com/my_patch.tar.gz"
image: "alpine:latest"
Expand Down
1 change: 1 addition & 0 deletions packages/shulker-server-minestom-demo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ tasks {
}

shadowJar {
dependsOn(":packages:shulker-server-agent:shadowJar")
mergeServiceFiles()
}
}

0 comments on commit 03ea312

Please sign in to comment.