Skip to content

fix merge conflict

fix merge conflict #7

# 💐💚 coder-images: Optimized, and easy Docker images and Coder templates to use in your everyday work!
# Copyright (c) 2022-2023 Noel <[email protected]>
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in all
# copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
# SOFTWARE.
name: Update Coder Template
on:
workflow_dispatch: {}
push:
branches:
- master
paths:
- 'template/**'
jobs:
update-template:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Get latest commit hash
id: commit
run: echo "hash=$(git rev-parse --short=8 HEAD)" >> $GITHUB_OUTPUT
- name: Update Coder template!
uses: matifali/update-coder-template@v2
with:
CODER_TEMPLATE_VERSION: "${{steps.outputs.commit.hash}}"
CODER_SESSION_TOKEN: "${{secrets.CODER_TOKEN}}"
CODER_TEMPLATE_NAME: coder
CODER_TEMPLATE_DIR: ./template
CODER_URL: "https://coder.floofy.dev"