Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Copy released JSON to board URL, not new one #8182

Merged
merged 2 commits into from
Jun 28, 2021
Merged

Copy released JSON to board URL, not new one #8182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b20081a
Copy released JSON to board URL, not new one
earlephilhower Jun 26, 2021
df5bdd0
Be more paranoid about JSON format, check after d/l
earlephilhower Jun 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions .github/workflows/release-to-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,6 @@ jobs:
run:
shell: bash
steps:
- uses: actions/checkout@v2
with:
submodules: true
fetch-depth: 0
- uses: actions/setup-python@v2
with:
python-version: '3.x'
- name: Set GIT tag name
run: |
TRAVIS_TAG="$(git describe --exact-match --tags)"
echo "TRAVIS_TAG=${TRAVIS_TAG}" >> $GITHUB_ENV
- name: Deploy updated JSON
env:
TRAVIS_BUILD_DIR: ${{ github.workspace }}
BUILD_TYPE: package
CI_GITHUB_API_KEY: ${{ secrets.GITHUB_TOKEN }}
GHCI_DEPLOY_KEY: ${{ secrets.GHCI_DEPLOY_KEY }}
run: |
bash ./tests/ci/build_package.sh
# Only the regenerated JSON file will be used, but it's simpler
# than looking for it in a GH release.
bash ./package/deploy_package_index.sh

17 changes: 5 additions & 12 deletions package/deploy_package_index.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,15 @@ cd $(dirname "$0")

set -e # Abort with error if anything here does not go as expected!

# Install SSH private key from a GH Secret
echo $GHCI_DEPLOY_KEY | base64 -d > esp8266_github_io_deploy
eval "$(ssh-agent -s)"
chmod 600 esp8266_github_io_deploy
ssh-add esp8266_github_io_deploy
mkdir -p ~/.ssh
chmod go-w ~/.ssh
echo -e "Host github.com\nStrictHostKeyChecking no\n" >> ~/.ssh/config
chmod go-w ~/.ssh/config

# Clone the Github pages repository
git clone [email protected]:esp8266/esp8266.github.io.git
pushd esp8266.github.io

# Update the package index
cp ../versions/*/package_esp8266com_index.json stable/package_esp8266com_index.json
# Copy from published release, ensure JSON valid
rm -f stable/package_esp8266com_index.json
wget "https://github.com/esp8266/Arduino/releases/download/$tag/package_esp8266com_index.json" -O stable/package_esp8266com_index.json
cat stable/package_esp8266com_index.json | jq empty

git add stable/package_esp8266com_index.json

# Commit and push the changes
Expand Down