Skip to content

Commit 496f979

Browse files
committed
Minor updates
- Update Docker sample build to use ASP.NET 8.0 - Add missing CR_HOST to GitHub build workflow - Add note to README about using Gitea
1 parent 29fc731 commit 496f979

File tree

8 files changed

+212
-41
lines changed

8 files changed

+212
-41
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: ci
2+
run-name: ${{ github.actor }} is running ci
3+
4+
on: [push, pull_request]
5+
6+
jobs:
7+
build-docker-image:
8+
name: "Build Docker image"
9+
permissions:
10+
packages: write
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Run build.bash
17+
env:
18+
CR_HOST: ${{secrets.CR_HOST}}
19+
CR_OWNER: ${{secrets.CR_OWNER}}
20+
CR_PASSWORD: ${{secrets.CR_PASSWORD}}
21+
CR_USER: ${{secrets.CR_USER}}
22+
GITHUB_REPOSITORY: ${{ github.repository }}
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
24+
run: ./build.bash -p

.gitignore

Lines changed: 172 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33
##
4-
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
4+
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
55

66
# User-specific files
77
*.rsuser
88
*.suo
99
*.user
1010
*.userosscache
1111
*.sln.docstates
12+
*.env
1213

1314
# User-specific files (MonoDevelop/Xamarin Studio)
1415
*.userprefs
@@ -21,17 +22,37 @@ mono_crash.*
2122
[Dd]ebugPublic/
2223
[Rr]elease/
2324
[Rr]eleases/
24-
x64/
25-
x86/
25+
26+
[Dd]ebug/x64/
27+
[Dd]ebugPublic/x64/
28+
[Rr]elease/x64/
29+
[Rr]eleases/x64/
30+
bin/x64/
31+
obj/x64/
32+
33+
[Dd]ebug/x86/
34+
[Dd]ebugPublic/x86/
35+
[Rr]elease/x86/
36+
[Rr]eleases/x86/
37+
bin/x86/
38+
obj/x86/
39+
2640
[Ww][Ii][Nn]32/
2741
[Aa][Rr][Mm]/
2842
[Aa][Rr][Mm]64/
43+
[Aa][Rr][Mm]64[Ee][Cc]/
2944
bld/
30-
[Bb]in/
3145
[Oo]bj/
46+
[Oo]ut/
3247
[Ll]og/
3348
[Ll]ogs/
3449

50+
# Build results on 'Bin' directories
51+
**/[Bb]in/*
52+
# Uncomment if you have tasks that rely on *.refresh files to move binaries
53+
# (https://github.com/github/gitignore/pull/3736)
54+
#!**/[Bb]in/*.refresh
55+
3556
# Visual Studio 2015/2017 cache/options directory
3657
.vs/
3758
# Uncomment if you have tasks that create the project's static files in wwwroot
@@ -43,12 +64,16 @@ Generated\ Files/
4364
# MSTest test Results
4465
[Tt]est[Rr]esult*/
4566
[Bb]uild[Ll]og.*
67+
*.trx
4668

4769
# NUnit
4870
*.VisualState.xml
4971
TestResult.xml
5072
nunit-*.xml
5173

74+
# Approval Tests result files
75+
*.received.*
76+
5277
# Build Results of an ATL Project
5378
[Dd]ebugPS/
5479
[Rr]eleasePS/
@@ -75,13 +100,16 @@ StyleCopReport.xml
75100
*.ilk
76101
*.meta
77102
*.obj
103+
*.idb
78104
*.iobj
79105
*.pch
80106
*.pdb
81107
*.ipdb
82108
*.pgc
83109
*.pgd
84110
*.rsp
111+
# but not Directory.Build.rsp, as it configures directory-level build defaults
112+
!Directory.Build.rsp
85113
*.sbr
86114
*.tlb
87115
*.tli
@@ -90,6 +118,7 @@ StyleCopReport.xml
90118
*.tmp_proj
91119
*_wpftmp.csproj
92120
*.log
121+
*.tlog
93122
*.vspscc
94123
*.vssscc
95124
.builds
@@ -152,6 +181,7 @@ coverage*.info
152181

153182
# NCrunch
154183
_NCrunch_*
184+
.NCrunch_*
155185
.*crunch*.local.xml
156186
nCrunchTemp_*
157187

@@ -293,6 +323,14 @@ node_modules/
293323
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
294324
*.vbw
295325

326+
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
327+
*.dsw
328+
*.dsp
329+
330+
# Visual Studio 6 technical files
331+
*.ncb
332+
*.aps
333+
296334
# Visual Studio LightSwitch build output
297335
**/*.HTMLClient/GeneratedArtifacts
298336
**/*.DesktopClient/GeneratedArtifacts
@@ -302,22 +340,22 @@ node_modules/
302340
_Pvt_Extensions
303341

304342
# Paket dependency manager
305-
.paket/paket.exe
343+
**/.paket/paket.exe
306344
paket-files/
307345

308346
# FAKE - F# Make
309-
.fake/
347+
**/.fake/
310348

311349
# CodeRush personal settings
312-
.cr/personal
350+
**/.cr/personal
313351

314352
# Python Tools for Visual Studio (PTVS)
315-
__pycache__/
353+
**/__pycache__/
316354
*.pyc
317355

318356
# Cake - Uncomment if you are using it
319-
# tools/**
320-
# !tools/packages.config
357+
#tools/**
358+
#!tools/packages.config
321359

322360
# Tabs Studio
323361
*.tss
@@ -339,15 +377,22 @@ ASALocalRun/
339377

340378
# MSBuild Binary and Structured Log
341379
*.binlog
380+
MSBuild_Logs/
381+
382+
# AWS SAM Build and Temporary Artifacts folder
383+
.aws-sam
342384

343385
# NVidia Nsight GPU debugger configuration file
344386
*.nvuser
345387

346388
# MFractors (Xamarin productivity tool) working folder
347-
.mfractor/
389+
**/.mfractor/
348390

349391
# Local History for Visual Studio
350-
.localhistory/
392+
**/.localhistory/
393+
394+
# Visual Studio History (VSHistory) files
395+
.vshistory/
351396

352397
# BeatPulse healthcheck temp database
353398
healthchecksdb
@@ -356,7 +401,121 @@ healthchecksdb
356401
MigrationBackup/
357402

358403
# Ionide (cross platform F# VS Code tools) working folder
359-
.ionide/
404+
**/.ionide/
360405

361406
# Fody - auto-generated XML schema
362407
FodyWeavers.xsd
408+
409+
# VS Code files for those working on multiple tools
410+
.vscode/*
411+
!.vscode/settings.json
412+
!.vscode/tasks.json
413+
!.vscode/launch.json
414+
!.vscode/extensions.json
415+
!.vscode/*.code-snippets
416+
417+
# Local History for Visual Studio Code
418+
.history/
419+
420+
# Built Visual Studio Code Extensions
421+
*.vsix
422+
423+
# Windows Installer files from build outputs
424+
*.cab
425+
*.msi
426+
*.msix
427+
*.msm
428+
*.msp
429+
430+
### https://github.com/github/gitignore/blob/main/Global/Linux.gitignore
431+
*~
432+
433+
# temporary files which can be created if a process still has a handle open of a deleted file
434+
.fuse_hidden*
435+
436+
# Metadata left by Dolphin file manager, which comes with KDE Plasma
437+
.directory
438+
439+
# Linux trash folder which might appear on any partition or disk
440+
.Trash-*
441+
442+
# .nfs files are created when an open file is removed but is still being accessed
443+
.nfs*
444+
445+
# Log files created by default by the nohup command
446+
nohup.out
447+
448+
### https://github.com/github/gitignore/blob/main/Global/macOS.gitignore
449+
# General
450+
.DS_Store
451+
__MACOSX/
452+
.AppleDouble
453+
.LSOverride
454+
Icon[]
455+
456+
# Thumbnails
457+
._*
458+
459+
# Files that might appear in the root of a volume
460+
.DocumentRevisions-V100
461+
.fseventsd
462+
.Spotlight-V100
463+
.TemporaryItems
464+
.Trashes
465+
.VolumeIcon.icns
466+
.com.apple.timemachine.donotpresent
467+
468+
# Directories potentially created on remote AFP share
469+
.AppleDB
470+
.AppleDesktop
471+
Network Trash Folder
472+
Temporary Items
473+
.apdisk
474+
475+
### https://github.com/github/gitignore/blob/main/Global/Vim.gitignore
476+
# Swap
477+
[._]*.s[a-v][a-z]
478+
# comment out the next line if you don't need vector files
479+
!*.svg
480+
[._]*.sw[a-p]
481+
[._]s[a-rt-v][a-z]
482+
[._]ss[a-gi-z]
483+
[._]sw[a-p]
484+
485+
# Session
486+
Session.vim
487+
Sessionx.vim
488+
489+
# Temporary
490+
.netrwhist
491+
*~
492+
# Auto-generated tag files
493+
tags
494+
# Persistent undo
495+
[._]*.un~
496+
497+
### https://github.com/github/gitignore/blob/main/Global/Windows.gitignore
498+
# Windows thumbnail cache files
499+
Thumbs.db
500+
Thumbs.db:encryptable
501+
ehthumbs.db
502+
ehthumbs_vista.db
503+
504+
# Dump file
505+
*.stackdump
506+
507+
# Folder config file
508+
[Dd]esktop.ini
509+
510+
# Recycle Bin used on file shares
511+
$RECYCLE.BIN/
512+
513+
# Windows Installer files
514+
*.cab
515+
*.msi
516+
*.msix
517+
*.msm
518+
*.msp
519+
520+
# Windows shortcuts
521+
*.lnk

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
## [1.3.1] - 2025-09-17
11+
12+
- Update Docker sample build to use ASP.NET 8.0
13+
- Add missing CR_HOST to GitHub build workflow
14+
- Add note to README about using Gitea
15+
1016
## [1.3.0] - 2023-06-21
1117

1218
### Changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# prepare base image
2-
FROM mcr.microsoft.com/dotnet/runtime:7.0 AS base
2+
FROM mcr.microsoft.com/dotnet/runtime:8.0 AS base
33
WORKDIR /app
44

55
# get build image
6-
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
6+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
77
WORKDIR /src
88

99
# run dotnet restore

README.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,10 @@ Environment variables (all are optional):
4545

4646
1. Get credentials for pushing containers into your desired registry or registries.
4747

48-
- GitHub [Personal Access Token for the GitHub Container Registry](https://docs.github.com/en/free-pro-team@latest/packages/guides/pushing-and-pulling-docker-images#authenticating-to-github-container-registry).
49-
- Docker Hub [Personal Access Token](https://docs.docker.com/docker-hub/access-tokens/).
5048
- Azure container registry [credentials](https://azure.microsoft.com/en-us/services/container-registry/).
49+
- Docker Hub [Personal Access Token](https://docs.docker.com/docker-hub/access-tokens/).
50+
- GitHub [Personal Access Token for the GitHub Container Registry](https://docs.github.com/en/free-pro-team@latest/packages/guides/pushing-and-pulling-docker-images#authenticating-to-github-container-registry).
51+
- Gitea [Authentication](https://docs.gitea.com/development/api-usage#authentication)
5152

5253
#### Set up your Dockerfile
5354

@@ -73,8 +74,9 @@ See [this sample Dockerfile](https://github.com/mcld/buildscript/blob/main/Docke
7374

7475
- Review sample CI configurations:
7576

76-
- [GitHub Action](https://github.com/mcld/buildscript/blob/main/.github/workflows/build.yml)
7777
- [Azure Pipeline](https://github.com/mcld/buildscript/blob/main/azure-pipelines.yml)
78+
- [GitHub Action](https://github.com/mcld/buildscript/blob/main/.github/workflows/build.yml)
79+
- [Gitea Action](https://docs.gitea.com/usage/actions/overview) - Gitea is able to use the GitHub action listed above or a workflow in .gitlab/workflows
7880

7981
- Push some branches and open and resolve some PRs to see if the build works successfully.
8082

0 commit comments

Comments
 (0)