Skip to content

Commit

Permalink
chore: Update config, git attributes (#360)
Browse files Browse the repository at this point in the history
  • Loading branch information
DaveSkender authored Sep 6, 2024
1 parent f70d976 commit 3ddf71b
Show file tree
Hide file tree
Showing 11 changed files with 173 additions and 254 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# top-most EditorConfig file
root = true

# see Client and Server folders for
# language unique editor configurations

# global baselines
[*]
charset = utf-8
Expand All @@ -18,6 +21,3 @@ insert_final_newline = true
[*.{xml,yml}]
indent_style = space
indent_size = 2

# see Client and Server folders for
# language unique editor configurations
65 changes: 2 additions & 63 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,63 +1,2 @@
###############################################################################
# Set default behavior to automatically normalize line endings.
###############################################################################
* text=auto

###############################################################################
# Set default behavior for command prompt diff.
#
# This is need for earlier builds of msysgit that does not have it on by
# default for csharp files.
# Note: This is only used by command line
###############################################################################
#*.cs diff=csharp

###############################################################################
# Set the merge driver for project and solution files
#
# Merging from the command prompt will add diff markers to the files if there
# are conflicts (Merging from VS is not affected by the settings below, in VS
# the diff markers are never inserted). Diff markers may cause the following
# file extensions to fail to load in VS. An alternative would be to treat
# these files as binary and thus will always conflict and require user
# intervention with every merge. To do so, just uncomment the entries below
###############################################################################
#*.sln merge=binary
#*.csproj merge=binary
#*.vbproj merge=binary
#*.vcxproj merge=binary
#*.vcproj merge=binary
#*.dbproj merge=binary
#*.fsproj merge=binary
#*.lsproj merge=binary
#*.wixproj merge=binary
#*.modelproj merge=binary
#*.sqlproj merge=binary
#*.wwaproj merge=binary

###############################################################################
# behavior for image files
#
# image files are treated as binary by default.
###############################################################################
#*.jpg binary
#*.png binary
#*.gif binary

###############################################################################
# diff behavior for common document formats
#
# Convert binary document formats to text before diffing them. This feature
# is only available from the command line. Turn it on by uncommenting the
# entries below.
###############################################################################
#*.doc diff=astextplain
#*.DOC diff=astextplain
#*.docx diff=astextplain
#*.DOCX diff=astextplain
#*.dot diff=astextplain
#*.DOT diff=astextplain
#*.pdf diff=astextplain
#*.PDF diff=astextplain
#*.rtf diff=astextplain
#*.RTF diff=astextplain
# Normalize line endings.
* text=lf
13 changes: 12 additions & 1 deletion .github/workflows/deploy-website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,17 @@ jobs:
dotnet-version: "8.x"
dotnet-quality: "ga"

- name: Define cache marker
id: marker
run: echo "version=$(date +'%Y.%m.%d')-${{ github.run_number }}" >> $GITHUB_OUTPUT

- name: Replace cache markers
uses: jacobtomlinson/gha-find-replace@v3
with:
find: "YYYY.MM.DD"
replace: "${{ steps.marker.outputs.version }}"
regex: false

- name: Build .NET solution
run: >
dotnet build Server/ChartBackend.sln
Expand Down Expand Up @@ -78,7 +89,7 @@ jobs:
working-directory: Client
run: npm install

- name: Define marker
- name: Define cache marker
id: marker
run: echo "version=$(date +'%Y.%m.%d')-${{ github.run_number }}" >> $GITHUB_OUTPUT

Expand Down
Loading

0 comments on commit 3ddf71b

Please sign in to comment.