Skip to content

Commit

Permalink
version 2.2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
A. Schulze committed Feb 10, 2024
1 parent 61b8c5a commit d0c1480
Show file tree
Hide file tree
Showing 11 changed files with 74 additions and 86 deletions.
34 changes: 4 additions & 30 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,44 +30,18 @@ jobs:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
# Learn more:
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed

steps:
- name: Checkout repository
uses: actions/checkout@v2

# Initializes the CodeQL tools for scanning.
uses: actions/checkout@v4
- name: Initialize CodeQL
uses: github/codeql-action/init@v1
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v1

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

uses: github/codeql-action/autobuild@v3
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v1
uses: github/codeql-action/analyze@v3
20 changes: 0 additions & 20 deletions .github/workflows/go-build.yml

This file was deleted.

19 changes: 19 additions & 0 deletions .github/workflows/gobuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: gobuild
on:
push:
pull_request:
workflow_dispatch:
schedule:
- cron: '5 5 1 * *'
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup go
uses: actions/setup-go@v5
with:
go-version: 1.21
- name: go build
run: go build -v
35 changes: 19 additions & 16 deletions .github/workflows/gofmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@ name: gofmt
on:
push:
pull_request:
workflow_dispatch:
schedule:
- cron: '1 1 1 * *'
jobs:
run_gofmt:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: set up go
uses: actions/setup-go@v4
with:
go-version: 'stable' # echo "go version" in the log
- name: run gofmt
shell: sh
run: |
files_with_format_issues="$( find . -name '*.go' -print0 | xargs --null --no-run-if-empty gofmt -l )"
echo 'files_with_format_issues:'
echo "${files_with_format_issues}"
num_files_with_format_issues="$( echo "${files_with_format_issues}" | grep --text --count '^./' || : )"
echo 'num_files_with_format_issues:'
echo "${num_files_with_format_issues}"
exit ${num_files_with_format_issues}
- name: checkout
uses: actions/checkout@v4
- name: set up go
uses: actions/setup-go@v4
with:
go-version: 'stable' # echo "go version" in the log
- name: run gofmt
shell: sh
run: |
files_with_format_issues="$( find . -name '*.go' -print0 | xargs --null --no-run-if-empty gofmt -l )"
echo 'files_with_format_issues:'
echo "${files_with_format_issues}"
num_files_with_format_issues="$( echo "${files_with_format_issues}" | grep --text --count '^./' || : )"
echo 'num_files_with_format_issues:'
echo "${num_files_with_format_issues}"
exit ${num_files_with_format_issues}
15 changes: 9 additions & 6 deletions .github/workflows/markdownlint.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
name: markdownlint
on:
push:
pull_request:
push:
pull_request:
workflow_dispatch:
schedule:
- cron: '2 2 1 * *'
jobs:
run_markdownlint:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: Run markdownlint
uses: actionshub/markdownlint@main
- name: checkout
uses: actions/checkout@v4
- name: Run markdownlint
uses: actionshub/markdownlint@main
16 changes: 10 additions & 6 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
name: shellcheck
on:
push:
pull_request:
workflow_dispatch:
schedule:
- cron: '4 4 1 * *'
jobs:
run_shellcheck:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: run shellcheck
uses: ludeeus/action-shellcheck@master
with:
severity: style
- name: checkout
uses: actions/checkout@v4
- name: run shellcheck
uses: ludeeus/action-shellcheck@master
with:
severity: style
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 2.2.1

- updated Github workflows
- updated dependenies

## 2.2.0

- updated Github workflows
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# scmdhttpd

[![Actions Status](https://github.com/andreasschulze/scmdhttpd/workflows/Go%20Build/badge.svg)](https://github.com/andreasschulze/scmdhttpd/actions?query=workflow%3AGo%20Build)
[![Actions Status](https://github.com/andreasschulze/scmdhttpd/workflows/gobuild/badge.svg)](https://github.com/andreasschulze/scmdhttpd/actions?query=workflow%3Agobuild)
[![Actions Status](https://github.com/andreasschulze/scmdhttpd/workflows/CodeQL/badge.svg)](https://github.com/andreasschulze/scmdhttpd/actions?query=workflow%3ACodeQL)
[![gofmt](https://github.com/andreasschulze/scmdhttpd/actions/workflows/gofmt.yml/badge.svg)](https://github.com/andreasschulze/scmdhttpd/actions/workflows/gofmt.yml)
[![markdownlint](https://github.com/andreasschulze/scmdhttpd/actions/workflows/markdownlint.yml/badge.svg)](https://github.com/andreasschulze/scmdhttpd/actions/workflows/markdownlint.yml)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
module github.com/andreasschulze/scmdhttpd

go 1.22
go 1.21

require golang.org/x/crypto v0.17.0

require (
golang.org/x/net v0.17.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/text v0.14.0 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k=
golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
2 changes: 1 addition & 1 deletion scmdhttpd.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
const (
certsDir = "certs"
programName = "scmdHTTPd"
programVersion = "2.2.0"
programVersion = "2.2.1"
)

var (
Expand Down

0 comments on commit d0c1480

Please sign in to comment.