summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Mastenbroek <mail.fabianm@gmail.com>2023-01-27 22:19:22 +0000
committerGitHub <noreply@github.com>2023-01-27 22:19:22 +0000
commitdd9b7b1e0c59c010fb191a1ea1d805f2748fb216 (patch)
tree25b6112634dbd7bd46ec8eca2656f13fcc9ceb3c
parenta7ae00115ed8d65c64830d93ed5e502f122480ef (diff)
parentc31c80293f27ad474a2b9525e82e535b5a9076ae (diff)
merge: Address issues with pre-release workflow (#129)
This pull request addresses the issues encountered during the release of the last release candidate (v3.0-rc1). ## Implementation Notes :hammer_and_pick: * Fix Docker build for web UI * Allow version to be overridable * Update latest release in documentation
-rw-r--r--.github/workflows/publish.yml3
-rw-r--r--README.md6
-rw-r--r--build.gradle.kts3
-rw-r--r--gradle.properties3
-rw-r--r--site/docs/getting-started/0-installation.md2
5 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index ce25802f..129cc049 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -29,7 +29,6 @@ jobs:
with:
push: true
file: opendc-web/opendc-web-runner/Dockerfile
- repository: atlargeresearch/opendc
tags: ${{ steps.prep.outputs.tags }}
push-api:
name: Push API to DockerHub
@@ -59,6 +58,8 @@ jobs:
name: Push UI to DockerHub
runs-on: ubuntu-22.04
steps:
+ - name: Checkout repository
+ uses: actions/checkout@v3
- name: Prepare
id: prep
run: |
diff --git a/README.md b/README.md
index a82848bb..be09e2a7 100644
--- a/README.md
+++ b/README.md
@@ -7,8 +7,8 @@
Collaborative Datacenter Simulation and Exploration for Everybody
[![MIT License](https://img.shields.io/badge/License-MIT-green.svg)](/LICENSE.txt)
-[![Documentation](https://img.shields.io/badge/docs-master-green.svg)](https://opendc.org)
-[![GitHub release](https://img.shields.io/github/release/atlarge-research/opendc)](https://github.com/atlarge-research/opendc/releases)
+[![Documentation](https://img.shields.io/badge/docs-master-green.svg)](https://atlarge-research.github.io/opendc)
+[![GitHub release](https://img.shields.io/github/v/release/atlarge-research/opendc?include_prereleases)](https://github.com/atlarge-research/opendc/releases)
[![Build](https://github.com/atlarge-research/opendc/actions/workflows/build.yml/badge.svg)](https://github.com/atlarge-research/opendc/actions/workflows/build.yml)
-----
@@ -18,7 +18,7 @@ This repository is the home of the OpenDC project, a free and open-source platfo
## Latest Release
- General Availability (GA): [OpenDC v2.0](https://github.com/atlarge-research/opendc/releases/tag/v2.0) (May 10, 2021)
-- Preview (Release Candidate): n/a
+- Preview (Release Candidate): [OpenDC v3.0-rc1](https://github.com/atlarge-research/opendc/releases/tag/v3.0-rc1) (Jan 27, 2023)
## Documentation
diff --git a/build.gradle.kts b/build.gradle.kts
index 42a7f366..1a64b77e 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -24,3 +24,6 @@ plugins {
`dokka-conventions`
`jacoco-aggregation`
}
+
+group = "org.opendc"
+version = "3.0-SNAPSHOT"
diff --git a/gradle.properties b/gradle.properties
index 99952a92..06c56148 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -20,9 +20,6 @@
# SOFTWARE.
#
-group = org.opendc
-version = 3.0-SNAPSHOT
-
# For Dokka https://github.com/Kotlin/dokka/issues/1405
org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G
diff --git a/site/docs/getting-started/0-installation.md b/site/docs/getting-started/0-installation.md
index 9b9b0e82..e0e944cc 100644
--- a/site/docs/getting-started/0-installation.md
+++ b/site/docs/getting-started/0-installation.md
@@ -20,7 +20,7 @@ quicker.
## Download
-To get an OpenDC distribution, download a recent stable version from our [Releases](https://github.com/atlarge-research/opendc/releases)
+To get an OpenDC distribution, download a recent version from our [Releases](https://github.com/atlarge-research/opendc/releases)
page on GitHub.
## Setup