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

Week 41, October 2022 #182

Merged
merged 3 commits into from
Oct 12, 2022
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
31 changes: 31 additions & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,34 @@ jobs:
steps:
- name: HTTP request
run: curl -sS "http://nivlheim-test.uio.no/hook.pl?commit=${GITHUB_SHA}&branch=${GITHUB_REF_NAME}"

release:
if: ${{ github.ref == 'refs/heads/master' }}
name: Tag and release
needs: [test-scripts]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
fetch-depth: 50
- name: Create a version tag
id: tagstep
uses: salsify/action-detect-and-tag-new-version@v2
with:
version-command: cat VERSION
- name: Generate changelog
if: steps.tagstep.outputs.tag != ''
id: changelog
uses: jaywcjlove/changelog-generator@main
with:
token: ${{ secrets.GITHUB_TOKEN }}
filter: '[R|r]elease[d]\s+[v|V]\d(\.\d+){0,2}'
- name: Create a new release
if: steps.tagstep.outputs.tag != ''
uses: softprops/action-gh-release@v1
with:
body: ${{ steps.changelog.outputs.changelog }}
draft: false
prerelease: false
tag_name: ${{ steps.tagstep.outputs.tag }}
generate_release_notes: true
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.7.14
2.7.15
2 changes: 1 addition & 1 deletion client/nivlheim_client
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ my $NAME = 'nivlheim_client';
my $AUTHOR = 'Øyvind Hagberg';
my $CONTACT = '[email protected]';
my $RIGHTS = 'USIT/IT-DRIFT/GD/GID, University of Oslo, Norway';
my $VERSION = '2.7.14';
my $VERSION = '2.7.15';

# Usage text
my $USAGE = <<"END_USAGE";
Expand Down
2 changes: 1 addition & 1 deletion client/windows/nivlheim_client.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ param(
[bool]$nosleep = $false
)

Set-Variable version -option Constant -value "2.7.14"
Set-Variable version -option Constant -value "2.7.15"
Set-Variable useragent -option Constant -value "NivlheimPowershellClient/$version"
Set-PSDebug -strict
Set-StrictMode -version "Latest" # http://technet.microsoft.com/en-us/library/hh849692.aspx
Expand Down
4 changes: 2 additions & 2 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
nivlheim (2.7.14-1) buster; urgency=low
nivlheim (2.7.15-1) buster; urgency=low

* Upstream changes, no changes in the client

-- Øyvind Hagberg <[email protected]> Fri, 16 Sep 2022 15:59:00 +0200
-- Øyvind Hagberg <[email protected]> Mon, 10 Oct 2022 13:55:00 +0200

nivlheim (2.7.13-1) buster; urgency=low

Expand Down
3 changes: 3 additions & 0 deletions server/httpd.conf
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@ Header set Strict-Transport-Security "max-age=3600"
Header set Content-Security-Policy "default-src 'none'; script-src 'self'; connect-src 'self'; img-src 'self'; style-src 'self'; font-src 'self'; frame-ancestors 'none'; upgrade-insecure-requests"
Header set X-Frame-Options "deny"

# Prevent Cross Site Tracing attacks. See also: https://owasp.org/www-community/attacks/Cross_Site_Tracing
TraceEnable off

#
# ServerAdmin: Your address, where problems with the server should be
# e-mailed. This address appears on some server-generated pages, such
Expand Down