Compare commits
No commits in common. "master" and "feature/deploy" have entirely different histories.
master
...
feature/de
|
|
@ -9,8 +9,16 @@ jobs:
|
|||
build-and-deploy:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
#- name: Adding Known Hosts
|
||||
#run: ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
||||
- uses: actions/checkout@v2
|
||||
|
||||
- name: Install SSH Key
|
||||
uses: shimataro/ssh-key-action@v2
|
||||
with:
|
||||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
known_hosts: unnecessary
|
||||
|
||||
- name: Adding Known Hosts
|
||||
run: ssh-keyscan -p ${{ secrets.SSH_PORT }} -H ${{ secrets.SSH_HOST }} >> ~/.ssh/known_hosts
|
||||
|
||||
- name: Deploy to server
|
||||
uses: appleboy/ssh-action@master
|
||||
|
|
@ -20,6 +28,6 @@ jobs:
|
|||
key: ${{ secrets.SSH_PRIVATE_KEY }}
|
||||
port: ${{ secrets.SSH_PORT }}
|
||||
script: |
|
||||
cd /home/www
|
||||
rm -rf /home/www/artseyio.zacg.com && mkdir /home/www/artseyio.zacg.com
|
||||
cd /home/zach/www
|
||||
rm -rf /home/zach/www/artseyio.zacg.com && mkdir /home/zach/www/artseyio.zacg.com
|
||||
git clone git@git.zacg.com:zach/artseyio-typing-tutor.git artseyio.zacg.com
|
||||
|
|
|
|||
14
index.html
14
index.html
|
|
@ -5,7 +5,7 @@
|
|||
<title>ARTSEYIO Typing Tutor</title>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"
|
||||
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="css/artsey-tutor.css">
|
||||
<link rel="stylesheet" href="/css/artsey-tutor.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -19,14 +19,14 @@
|
|||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="index.html">ARTSEYIO Typing Tutor</a>
|
||||
<a class="navbar-brand" href="/index.html">ARTSEYIO Typing Tutor</a>
|
||||
</div>
|
||||
<div id="navbar" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
<li class="active"><a href="index.html">Home</a></li>
|
||||
<li><a href="about.html">About</a></li>
|
||||
<li><a href="contact.html">Contact</a></li>
|
||||
<li><a href="learn.html">Learn</a></li>
|
||||
<li class="active"><a href="/index.html">Home</a></li>
|
||||
<li><a href="/about.html">About</a></li>
|
||||
<li><a href="/contact.html">Contact</a></li>
|
||||
<li><a href="/learn.html">Learn</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right"></ul>
|
||||
</div>
|
||||
|
|
@ -48,6 +48,6 @@
|
|||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"
|
||||
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
|
||||
crossorigin="anonymous"></script>
|
||||
<script src="js/artsey-tutor.js"></script>
|
||||
<script src="/js/artsey-tutor.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
12
learn.html
12
learn.html
|
|
@ -5,7 +5,7 @@
|
|||
<title>ARTSEYIO Typing Tutor</title>
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/css/bootstrap.min.css"
|
||||
integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="css/artsey-tutor.css">
|
||||
<link rel="stylesheet" href="/css/artsey-tutor.css">
|
||||
</head>
|
||||
<body>
|
||||
|
||||
|
|
@ -16,10 +16,10 @@
|
|||
</div>
|
||||
<div id="navbar" class="navbar-default">
|
||||
<ul class="nav navbar-nav">
|
||||
<li><a href="index.html">Home</a></li>
|
||||
<li><a href="about.html">About</a></li>
|
||||
<li><a href="contact.html">Contact</a></li>
|
||||
<li class="active"><a href="learn.html">Learn</a></li>
|
||||
<li><a href="/index.html">Home</a></li>
|
||||
<li><a href="/about.html">About</a></li>
|
||||
<li><a href="/contact.html">Contact</a></li>
|
||||
<li class="active"><a href="/learn.html">Learn</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav navbar-right"></ul>
|
||||
</div>
|
||||
|
|
@ -58,6 +58,6 @@
|
|||
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/bootstrap@3.3.7/dist/js/bootstrap.min.js"
|
||||
integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
|
||||
crossorigin="anonymous"></script>
|
||||
<script type="text/javascript" src="js/artsey-tutor.js"></script>
|
||||
<script type="text/javascript" src="/js/artsey-tutor.js"></script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue