Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix version detection, top-left banner, and add deployment badges #137

Merged
merged 3 commits into from
Jan 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ jobs:
echo "::set-output name=name::${GITHUB_REPOSITORY_LC}"
echo "Name: ${GITHUB_REPOSITORY_LC}"

VERSION=$(git describe --tags)
echo "::set-output name=version::${VERSION}"
echo "Version: ${VERSION}"

DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo "::set-output name=date::${DATE}"
echo "Date: ${DATE}"

if [ "${{ github.event_name }}" = "repository_dispatch" ]; then
if [ "${{ github.event.action }}" = "publish_latest_tag" ]; then
REF="refs/tags/$(git describe $(git rev-list --tags --max-count=1) --tags)"
Expand All @@ -69,6 +61,14 @@ jobs:
echo "::set-output name=ref::${REF}"
echo "Ref: ${REF}"

VERSION=$(git describe --tags)
echo "::set-output name=version::${VERSION}"
echo "Version: ${VERSION}"

DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
echo "::set-output name=date::${DATE}"
echo "Date: ${DATE}"

SHA="$(git rev-parse --verify ${REF})"
echo "::set-output name=sha::${SHA}"
echo "Sha: ${SHA}"
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
[![GitHub Workflow Status (Publish Image)](https://img.shields.io/github/workflow/status/OpenTTD/website/Publish%20image?label=publish)](https://github.com/OpenTTD/website/actions?query=workflow%3A%22Publish+image%22)
[![GitHub Workflow Status (Deployments)](https://img.shields.io/github/workflow/status/OpenTTD/website/Deployment?label=deployment)](https://github.com/OpenTTD/website/actions?query=workflow%3A%22Deployment%22)

[![GitHub deployments (Staging)](https://img.shields.io/github/deployments/OpenTTD/website/staging?label=staging)](https://github.com/OpenTTD/website/deployments)
[![GitHub deployments (Production)](https://img.shields.io/github/deployments/OpenTTD/website/production?label=production)](https://github.com/OpenTTD/website/deployments)


This is the main website for OpenTTD, as can be seen on [https://www.openttd.org/](https://www.openttd.org/).
'master' is always deployed on [staging](https://www.staging.openttd.org/).
Expand Down
5 changes: 1 addition & 4 deletions static/css/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,9 @@ body > header {
border-radius: 6px;
list-style: none;
margin: 0;
padding: 3px 10px 3px 45px;
padding: 6px 10px 6px 45px;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After the merge of my PR with the now more or less reverted change (#136) I for myself was a bit nerved by the slim padding. I made this change because of the compression of the text lines with a greater font size than the intended 11px (I use a minimal font size of 14px in my browser).

Now it looks more pleasing again but IMHO the site should take dissenting font and element sizes into account in a futury layout.

text-align: left;
}
#download-fast li:not(:last-child) {
margin: 0 0 2px 0;
}
#download-fast a {
color: #ccc;
font-size: 11px;
Expand Down