reference main branch instead of master branch (#11652)

using search-n-replace
pull/11657/head
Adrien Delorme 4 years ago committed by GitHub
parent ec912cae9e
commit 7661e41412
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -28,7 +28,7 @@ jobs:
go-version: '1.17'
- run: echo "$GITHUB_SHA"
- run: git fetch --all
- run: echo $(git merge-base origin/master $GITHUB_SHA)
- run: echo $(git merge-base origin/main $GITHUB_SHA)
- run: make ci-lint
check-fmt:
runs-on: ubuntu-latest

@ -17,7 +17,7 @@ on:
jobs:
# Build a fresh set of artifacts
build-artifacts:
uses: hashicorp/packer/.github/workflows/build.yml@master
uses: hashicorp/packer/.github/workflows/build.yml@main
github-release:
needs: build-artifacts
runs-on: ubuntu-latest

@ -8,7 +8,7 @@ jobs:
steps:
- name: Set deployment URL env
run:
echo "DEPLOYMENT_URL=https://packer-git-master.hashicorp.vercel.app" >> $GITHUB_ENV
echo "DEPLOYMENT_URL=https://packer-git-main.hashicorp.vercel.app" >> $GITHUB_ENV
- uses: actions/checkout@master
- uses: gaurav-nelson/github-action-markdown-link-check@v1
with:

@ -10,8 +10,8 @@ on:
push:
# Sequence of patterns matched against refs/heads
branches:
# Push events on master branch
- 'master'
# Push events on main branch
- 'main'
jobs:
website-docker-publish:

@ -9,7 +9,7 @@ project "packer" {
organization = "hashicorp"
repository = "packer"
release_branches = [
"master"
"main"
]
}
}

@ -125,7 +125,7 @@ lint: install-lint-deps ## Lint Go code
ci-lint: install-lint-deps ## On ci only lint newly added Go source files
@echo "==> Running linter on newly added Go source files..."
GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/master HEAD) ./...
GO111MODULE=on golangci-lint run --new-from-rev=$(shell git merge-base origin/main HEAD) ./...
fmt: ## Format Go code
@go fmt ./...

@ -83,7 +83,7 @@ res="$(curl --show-error --silent --fail --user "${CIRCLE_TOKEN}:" \
--request POST \
--header 'Content-Type: application/json' \
--header 'Accept: application/json' \
--data "{ \"branch\": \"master\" ,\"parameters\": { \"PRODUCT\": \"${PRODUCT_NAME}\", \"PKG_NAME\": \"${SN_ID}.zip\" } }" \
--data "{ \"branch\": \"main\" ,\"parameters\": { \"PRODUCT\": \"${PRODUCT_NAME}\", \"PKG_NAME\": \"${SN_ID}.zip\" } }" \
"${CIRCLE_ENDPOINT}/${CIRCLE_PROJECT}/pipeline")"
pipeline_id="$(echo "$res" | jq -r '.id')"
echo "CircleCI Pipeline $pipeline_id started"

@ -76,7 +76,7 @@ In an effort to support our self-serve model weve included links to resources
- [Writing vendor extension guide](/docs/plugins/creation)
- Sample development implemented by a [partner](https://github.com/exoscale/packer-plugin-exoscale)
- [Scaffolding plugin repository](https://github.com/hashicorp/packer-plugin-scaffolding) to help bootstrap a new contribution:
- Contributing to Packer [guidelines](https://github.com/hashicorp/packer/blob/master/.github/CONTRIBUTING.md)
- Contributing to Packer [guidelines](https://github.com/hashicorp/packer/blob/main/.github/CONTRIBUTING.md)
- [Packer developer community forum](https://discuss.hashicorp.com/c/packer/23)
- [Packer's source code](https://github.com/hashicorp/packer)
@ -87,22 +87,27 @@ We encourage vendors to closely follow the above guidance. Adopting the same str
Packer requires all code-level integrations to be written in the [Go](https://golang.org/) programming language and contain an [MPL-2.0](https://en.wikipedia.org/wiki/Mozilla_Public_License) open source license. The only knowledge necessary to write a plugin is basic command-line skills and knowledge of the Go programming language. When writing in Go-Language, HashiCorp has found the integration development process to be straightforward and simple when vendors pay close attention and follow the resources and by adopting the same structure and coding patterns helps expedite the review and release cycles. Please remember that all integration major steps should contain acceptance testing and the appropriate documentation.
Data Sources
- [Custom Data Sources documentation](/docs/plugins/creation/custom-datasources)
- [Example Data Source](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/datasource)
Builders
- [Custom Builders documentation](/docs/plugins/creation/custom-builders)
- [Example Builder](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/builder/order)
Provisioners
- [Custom Provisioners documentation](/docs/plugins/creation/custom-provisioners)
- [Example Provisioner](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/provisioner/toppings)
Post-Processors
- [Custom Post-Processors documentation](/docs/plugins/creation/custom-post-processors)
- [Example Post-Processor](https://github.com/hashicorp/packer-plugin-hashicups/tree/main/post-processor/receipt)
Packer-Plugin-SDK
- The [Packer-plugin SDK](https://github.com/hashicorp/packer-plugin-sdk) contains tools to help plugin developers with common needs, like handling SSH connections or basic plugin architecture.
#### 4. Review

@ -262,7 +262,7 @@ The documentation structure needed for Packer.io can be generated manually, by c
Once the first `docs.zip` file has been included into a release you will need to open a one time pull-request against [hashicorp/packer](https://github.com/hashicorp/packer) to register the plugin docs.
This is done by adding the block below for the respective plugin to the file [website/data/plugins-manifest.json](https://github.com/hashicorp/packer/blob/master/website/data/plugins-manifest.json).
This is done by adding the block below for the respective plugin to the file [website/data/plugins-manifest.json](https://github.com/hashicorp/packer/blob/main/website/data/plugins-manifest.json).
```json
{
@ -286,7 +286,7 @@ the Packer documentation.
Follow the next steps to get the Packer website running and preview the documentation changes:
- Get the [Packer source code](https://github.com/hashicorp/packer). Our website code is under the [website folder](https://github.com/hashicorp/packer/tree/master/website).
- Get the [Packer source code](https://github.com/hashicorp/packer). Our website code is under the [website folder](https://github.com/hashicorp/packer/tree/main/website).
- Generate the `docs.zip` file. You can find above the steps to do so.
- Add the `zipFile` attribute to the plugin entry in `plugins-manifest.json`. The value should be the full path of the `docs.zip` generated. For example:
@ -301,8 +301,8 @@ Follow the next steps to get the Packer website running and preview the document
}
```
- Go to the [website folder](https://github.com/hashicorp/packer/tree/master/website).
In the website README, follow the steps to [run the website with node](https://github.com/hashicorp/packer/tree/master/website#with-node).
- Go to the [website folder](https://github.com/hashicorp/packer/tree/main/website).
In the website README, follow the steps to [run the website with node](https://github.com/hashicorp/packer/tree/main/website#with-node).
- Once the website is up and running, the plugin documentation should be available in `http://localhost:3000/docs`.
### Plugin Development Tips and FAQs

@ -1 +1,5 @@
~> **This community maintained provisioner is currently unmaintained**; if you are interested in contributing or taking ownership of it, please reach out to us at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be found in the [README](https://github.com/hashicorp/packer/blob/master/README.md#unmaintained-plugins).
~> **This community maintained provisioner is currently unmaintained**; if you
are interested in contributing or taking ownership of it, please reach out to us
at [packer@hashicorp.com](mailto://packer@hashicorp.com). More details can be
found in the
[README](https://github.com/hashicorp/packer/blob/main/README.md#unmaintained-plugins).

@ -11,7 +11,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server'
const additionalComponents = { Badge, BadgesHeader, PluginBadge, Checklist }
const baseRoute = 'docs'
const localContentDir = 'content/docs'
const mainBranch = 'master'
const mainBranch = 'main'
const navDataFile = 'data/docs-nav-data.json'
const product = { name: productName, slug: productSlug }

@ -7,7 +7,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server'
const baseRoute = 'guides'
const navDataFile = 'data/guides-nav-data.json'
const localContentDir = 'content/guides'
const mainBranch = 'master'
const mainBranch = 'main'
const product = { name: productName, slug: productSlug }
export default function GuidesLayout(props) {

@ -7,7 +7,7 @@ import { getStaticGenerationFunctions } from '@hashicorp/react-docs-page/server'
const baseRoute = 'intro'
const navDataFile = 'data/intro-nav-data.json'
const localContentDir = 'content/intro'
const mainBranch = 'master'
const mainBranch = 'main'
const product = { name: productName, slug: productSlug }
export default function IntroLayout(props) {

@ -17,7 +17,7 @@ import {
const additionalComponents = { Badge, BadgesHeader, PluginBadge, Checklist }
const baseRoute = 'plugins'
const localContentDir = 'content/plugins'
const mainBranch = 'master'
const mainBranch = 'main'
const navDataFile = 'data/plugins-nav-data.json'
const product = { name: productName, slug: productSlug }
const remotePluginsFile = 'data/plugins-manifest.json'

Loading…
Cancel
Save